mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Clone single led color from other led (#157)
* start ledclone * led cloning: clone scan areas from original led main: show exceptions, better exit * tune json schema for new option. somwe cleanup * fix warnings and bug for framebuffer selection. thx to clang brought by new osx buikld on travis * make ledclone feature work flawlessly for effects too. Effect sees the ledstring without cloned leds. cloned leds will be inserted just before sending to leddevice additional: remove warnings and fix code style * fix warning
This commit is contained in:
@@ -7,8 +7,10 @@ find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED)
|
||||
|
||||
# The following I do not undrstand completely...
|
||||
# libQtCore.so uses some hardcoded library path inside which are incorrect after copying the file RPi file system
|
||||
# Therefor, an extra path is needed on which to find the required libraries
|
||||
LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
|
||||
# Therefore, an extra path is needed on which to find the required libraries
|
||||
IF ( EXISTS ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf )
|
||||
LINK_DIRECTORIES(${LINK_DIRECTORIES} ${CMAKE_FIND_ROOT_PATH}/lib/arm-linux-gnueabihf)
|
||||
ENDIF()
|
||||
|
||||
include_directories(${QT_INCLUDES})
|
||||
|
||||
|
@@ -420,7 +420,7 @@ void HyperionDaemon::createSystemFrameGrabber()
|
||||
// framebuffer -> if nothing other applies
|
||||
else
|
||||
{
|
||||
type == "framebuffer";
|
||||
type = "framebuffer";
|
||||
}
|
||||
Info( _log, "set screen capture device to '%s'", type.constData());
|
||||
}
|
||||
|
@@ -44,7 +44,6 @@
|
||||
#include <jsonserver/JsonServer.h>
|
||||
#include <protoserver/ProtoServer.h>
|
||||
#include <boblightserver/BoblightServer.h>
|
||||
#include <webconfig/WebConfig.h>
|
||||
#include <udplistener/UDPListener.h>
|
||||
#include <QJsonObject>
|
||||
|
||||
@@ -86,7 +85,6 @@ private:
|
||||
AmlogicWrapper* _amlGrabber;
|
||||
FramebufferWrapper* _fbGrabber;
|
||||
OsxWrapper* _osxGrabber;
|
||||
WebConfig* _webConfig;
|
||||
Hyperion* _hyperion;
|
||||
|
||||
unsigned _grabber_width;
|
||||
|
Reference in New Issue
Block a user