diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e808141..3fc263c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,11 +73,11 @@ include_directories("${PROJECT_BINARY_DIR}") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) if(ENABLE_QT5) -ADD_DEFINITIONS ( -DENABLE_QT5 ) -#find_package(Qt5Widgets) + ADD_DEFINITIONS ( -DENABLE_QT5 ) + #find_package(Qt5Widgets) else(ENABLE_QT5) -# Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4) + # Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4) endif(ENABLE_QT5) # Define the global output path of binaries @@ -100,23 +100,23 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall") if(ENABLE_QT5) #find_package(Qt5Core REQUIRED) -find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -# set(CMAKE_CXX_FLAGS "-fPIC") + find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") +# set(CMAKE_CXX_FLAGS "-fPIC") else(ENABLE_QT5) -# Configure the use of QT4 -find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED QUIET) + # Configure the use of QT4 + find_package(Qt4 COMPONENTS QtCore QtNetwork QtGui REQUIRED QUIET) endif(ENABLE_QT5) #add libusb and pthreads find_package(libusb-1.0 REQUIRED) find_package(Threads REQUIRED) if(ENABLE_QT5) -#include(${QT_USE_FILE}) -add_definitions(${QT_DEFINITIONS}) + #include(${QT_USE_FILE}) + add_definitions(${QT_DEFINITIONS}) else(ENABLE_QT5) -include(${QT_USE_FILE}) -add_definitions(${QT_DEFINITIONS}) + include(${QT_USE_FILE}) + add_definitions(${QT_DEFINITIONS}) endif(ENABLE_QT5) # TODO[TvdZ]: This linking directory should only be added if we are cross compiling diff --git a/config/hyperion.config.json b/config/hyperion.config.json index 5bc313c3..8c9d1ecc 100644 --- a/config/hyperion.config.json +++ b/config/hyperion.config.json @@ -134,18 +134,20 @@ // "forwarder" : // { // "proto" : ["127.0.0.1:19447"], -// "json" : ["127.0.0.1:19446"] +// "json" : ["127.0.0.1:19446"] // }, /// The configuration for the frame-grabber, contains the following items: /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] /// * frequency_Hz : The frequency of the frame grab [Hz] + /// * priority : The priority "framegrabber" : { - "width" : 80, - "height" : 45, - "frequency_Hz" : 10.0 + "width" : 80, + "height" : 45, + "frequency_Hz" : 10.0, + "priority" : 900 }, /// The configuration of the Kodi connection used to enable and disable the frame-grabber. Contains the following fields: @@ -187,7 +189,8 @@ /// * port : Port at which the boblight server is started // "boblightServer" : // { -// "port" : 19333 +// "port" : 19333, +// "priority" : 900 // }, /// Configuration for the embedded V4L2 grabber diff --git a/config/hyperion_x86.config.json b/config/hyperion_x86.config.json index ec21a35b..79a02589 100644 --- a/config/hyperion_x86.config.json +++ b/config/hyperion_x86.config.json @@ -391,19 +391,20 @@ "color" : [0,0,0], "effect" : "Rainbow swirl fast", "duration_ms" : 3000, - "priority" : 900 + "priority" : 990 }, /// The configuration for the frame-grabber, contains the following items: /// * width : The width of the grabbed frames [pixels] /// * height : The height of the grabbed frames [pixels] /// * frequency_Hz : The frequency of the frame grab [Hz] -// "framegrabber" : -// { -// "width" : 64, -// "height" : 64, -// "frequency_Hz" : 10.0 -// }, +/// "framegrabber" : +/// { +/// "width" : 64, +/// "height" : 64, +/// "frequency_Hz" : 10.0, +/// "priority" : 900 +/// }, /// The configuration of the XBMC connection used to enable and disable the frame-grabber. Contains the following fields: /// * xbmcAddress : The IP address of the XBMC-host @@ -444,7 +445,8 @@ /// * port : Port at which the boblight server is started // "boblightServer" : // { -// "port" : 19333 +// "port" : 19333, +// "priority" : 900 // }, "endOfJson" : "endOfJson" diff --git a/include/boblightserver/BoblightServer.h b/include/boblightserver/BoblightServer.h index d4049170..d6180ba3 100644 --- a/include/boblightserver/BoblightServer.h +++ b/include/boblightserver/BoblightServer.h @@ -25,7 +25,7 @@ public: /// @param hyperion Hyperion instance /// @param port port number on which to start listening for connections /// - BoblightServer(Hyperion * hyperion, uint16_t port = 19333); + BoblightServer(Hyperion * hyperion, const int priority, uint16_t port = 19333); ~BoblightServer(); /// @@ -54,4 +54,7 @@ private: /// List with open connections QSet _openConnections; + + /// hyperion priority + const int _priority; }; diff --git a/include/grabber/AmlogicWrapper.h b/include/grabber/AmlogicWrapper.h index c712b60e..cc4c803f 100644 --- a/include/grabber/AmlogicWrapper.h +++ b/include/grabber/AmlogicWrapper.h @@ -33,7 +33,7 @@ public: /// @param[in] updateRate_Hz The image grab rate [Hz] /// @param[in] hyperion The instance of Hyperion used to write the led values /// - AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion); + AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion); /// /// Destructor of this dispmanx frame grabber. Releases any claimed resources. diff --git a/include/grabber/DispmanxWrapper.h b/include/grabber/DispmanxWrapper.h index e64adf47..97431864 100644 --- a/include/grabber/DispmanxWrapper.h +++ b/include/grabber/DispmanxWrapper.h @@ -33,7 +33,7 @@ public: /// @param[in] updateRate_Hz The image grab rate [Hz] /// @param[in] hyperion The instance of Hyperion used to write the led values /// - DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion); + DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion); /// /// Destructor of this dispmanx frame grabber. Releases any claimed resources. diff --git a/libsrc/grabber/framebuffer/FramebufferFrameGrabber.h b/include/grabber/FramebufferFrameGrabber.h similarity index 100% rename from libsrc/grabber/framebuffer/FramebufferFrameGrabber.h rename to include/grabber/FramebufferFrameGrabber.h diff --git a/include/grabber/FramebufferWrapper.h b/include/grabber/FramebufferWrapper.h index 75252d24..00bd33c1 100644 --- a/include/grabber/FramebufferWrapper.h +++ b/include/grabber/FramebufferWrapper.h @@ -33,7 +33,7 @@ public: /// @param[in] updateRate_Hz The image grab rate [Hz] /// @param[in] hyperion The instance of Hyperion used to write the led values /// - FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion); + FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion); /// /// Destructor of this framebuffer frame grabber. Releases any claimed resources. diff --git a/libsrc/grabber/osx/OsxFrameGrabber.h b/include/grabber/OsxFrameGrabber.h similarity index 100% rename from libsrc/grabber/osx/OsxFrameGrabber.h rename to include/grabber/OsxFrameGrabber.h diff --git a/include/grabber/OsxWrapper.h b/include/grabber/OsxWrapper.h index fa597c67..63f23cd8 100644 --- a/include/grabber/OsxWrapper.h +++ b/include/grabber/OsxWrapper.h @@ -34,7 +34,7 @@ public: /// @param[in] updateRate_Hz The image grab rate [Hz] /// @param[in] hyperion The instance of Hyperion used to write the led values /// - OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion); + OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion); /// /// Destructor of this osx frame grabber. Releases any claimed resources. diff --git a/libsrc/boblightserver/BoblightClientConnection.cpp b/libsrc/boblightserver/BoblightClientConnection.cpp index a8e5a810..620e2e29 100644 --- a/libsrc/boblightserver/BoblightClientConnection.cpp +++ b/libsrc/boblightserver/BoblightClientConnection.cpp @@ -21,14 +21,14 @@ // project includes #include "BoblightClientConnection.h" -BoblightClientConnection::BoblightClientConnection(QTcpSocket *socket, Hyperion * hyperion) : +BoblightClientConnection::BoblightClientConnection(QTcpSocket *socket, const int priority, Hyperion * hyperion) : QObject(), _locale(QLocale::C), _socket(socket), _imageProcessor(ImageProcessorFactory::getInstance().newImageProcessor()), _hyperion(hyperion), _receiveBuffer(), - _priority(255), + _priority(priority), _ledColors(hyperion->getLedCount(), ColorRgb::BLACK) { // initalize the locale. Start with the default C-locale diff --git a/libsrc/boblightserver/BoblightClientConnection.h b/libsrc/boblightserver/BoblightClientConnection.h index ce866469..22ddfc20 100644 --- a/libsrc/boblightserver/BoblightClientConnection.h +++ b/libsrc/boblightserver/BoblightClientConnection.h @@ -26,7 +26,7 @@ public: /// @param socket The Socket object for this connection /// @param hyperion The Hyperion server /// - BoblightClientConnection(QTcpSocket * socket, Hyperion * hyperion); + BoblightClientConnection(QTcpSocket * socket, const int priority, Hyperion * hyperion); /// /// Destructor diff --git a/libsrc/boblightserver/BoblightServer.cpp b/libsrc/boblightserver/BoblightServer.cpp index d7a45cf3..3c4c04ce 100644 --- a/libsrc/boblightserver/BoblightServer.cpp +++ b/libsrc/boblightserver/BoblightServer.cpp @@ -5,11 +5,12 @@ #include #include "BoblightClientConnection.h" -BoblightServer::BoblightServer(Hyperion *hyperion, uint16_t port) : +BoblightServer::BoblightServer(Hyperion *hyperion, const int priority,uint16_t port) : QObject(), _hyperion(hyperion), _server(), - _openConnections() + _openConnections(), + _priority(priority) { if (!_server.listen(QHostAddress::Any, port)) { @@ -39,7 +40,7 @@ void BoblightServer::newConnection() if (socket != nullptr) { std::cout << "New boblight connection" << std::endl; - BoblightClientConnection * connection = new BoblightClientConnection(socket, _hyperion); + BoblightClientConnection * connection = new BoblightClientConnection(socket, _priority, _hyperion); _openConnections.insert(connection); // register slot for cleaning up after the connection closed diff --git a/libsrc/grabber/amlogic/AmlogicWrapper.cpp b/libsrc/grabber/amlogic/AmlogicWrapper.cpp index 29022afe..eb47e155 100644 --- a/libsrc/grabber/amlogic/AmlogicWrapper.cpp +++ b/libsrc/grabber/amlogic/AmlogicWrapper.cpp @@ -12,10 +12,10 @@ #include -AmlogicWrapper::AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) : +AmlogicWrapper::AmlogicWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion) : _updateInterval_ms(1000/updateRate_Hz), _timeout_ms(2 * _updateInterval_ms), - _priority(999), + _priority(priority), _timer(), _image(grabWidth, grabHeight), _frameGrabber(new AmlogicGrabber(grabWidth, grabHeight)), diff --git a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp index 7868ce34..a0d39d45 100644 --- a/libsrc/grabber/dispmanx/DispmanxWrapper.cpp +++ b/libsrc/grabber/dispmanx/DispmanxWrapper.cpp @@ -12,10 +12,10 @@ #include -DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) : +DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion) : _updateInterval_ms(1000/updateRate_Hz), _timeout_ms(2 * _updateInterval_ms), - _priority(1000), + _priority(priority), _timer(), _image(grabWidth, grabHeight), _frameGrabber(new DispmanxFrameGrabber(grabWidth, grabHeight)), diff --git a/libsrc/grabber/framebuffer/CMakeLists.txt b/libsrc/grabber/framebuffer/CMakeLists.txt index dc585f42..0dec11f4 100644 --- a/libsrc/grabber/framebuffer/CMakeLists.txt +++ b/libsrc/grabber/framebuffer/CMakeLists.txt @@ -1,39 +1,39 @@ - -# Find the BCM-package (VC control) -# find_package(BCM REQUIRED) -# include_directories(${BCM_INCLUDE_DIRS}) - -# Define the current source locations -SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber) -SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/framebuffer) - -# Group the headers that go through the MOC compiler -SET(FramebufferGrabberQT_HEADERS - ${CURRENT_HEADER_DIR}/FramebufferWrapper.h -) - -SET(FramebufferGrabberHEADERS - ${CURRENT_SOURCE_DIR}/FramebufferFrameGrabber.h -) - -SET(FramebufferGrabberSOURCES - ${CURRENT_SOURCE_DIR}/FramebufferWrapper.cpp - ${CURRENT_SOURCE_DIR}/FramebufferFrameGrabber.cpp -) - -if(ENABLE_QT5) -QT5_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS}) -else(ENABLE_QT5) -QT4_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS}) -endif(ENABLE_QT5) - -add_library(framebuffer-grabber - ${FramebufferGrabberHEADERS} - ${FramebufferGrabberQT_HEADERS} - ${FramebufferGrabberHEADERS_MOC} - ${FramebufferGrabberSOURCES} -) - -target_link_libraries(framebuffer-grabber - hyperion - ${QT_LIBRARIES}) + +# Find the BCM-package (VC control) +# find_package(BCM REQUIRED) +# include_directories(${BCM_INCLUDE_DIRS}) + +# Define the current source locations +SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber) +SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/framebuffer) + +# Group the headers that go through the MOC compiler +SET(FramebufferGrabberQT_HEADERS + ${CURRENT_HEADER_DIR}/FramebufferWrapper.h +) + +SET(FramebufferGrabberHEADERS + ${CURRENT_HEADER_DIR}/FramebufferFrameGrabber.h +) + +SET(FramebufferGrabberSOURCES + ${CURRENT_SOURCE_DIR}/FramebufferWrapper.cpp + ${CURRENT_SOURCE_DIR}/FramebufferFrameGrabber.cpp +) + +if(ENABLE_QT5) + QT5_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS}) +else(ENABLE_QT5) + QT4_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS}) +endif(ENABLE_QT5) + +add_library(framebuffer-grabber + ${FramebufferGrabberHEADERS} + ${FramebufferGrabberQT_HEADERS} + ${FramebufferGrabberHEADERS_MOC} + ${FramebufferGrabberSOURCES} +) + +target_link_libraries(framebuffer-grabber + hyperion + ${QT_LIBRARIES}) diff --git a/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp b/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp index 98baf977..bbc8969b 100755 --- a/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp +++ b/libsrc/grabber/framebuffer/FramebufferFrameGrabber.cpp @@ -10,7 +10,7 @@ #include // Local includes -#include "FramebufferFrameGrabber.h" +#include FramebufferFrameGrabber::FramebufferFrameGrabber(const std::string & device, const unsigned width, const unsigned height) : _fbfd(0), diff --git a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp index 96506d55..25a23311 100644 --- a/libsrc/grabber/framebuffer/FramebufferWrapper.cpp +++ b/libsrc/grabber/framebuffer/FramebufferWrapper.cpp @@ -5,12 +5,12 @@ // Framebuffer grabber includes #include -#include "FramebufferFrameGrabber.h" +#include -FramebufferWrapper::FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) : +FramebufferWrapper::FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion) : _updateInterval_ms(1000/updateRate_Hz), _timeout_ms(2 * _updateInterval_ms), - _priority(1000), + _priority(priority), _timer(), _image(grabWidth, grabHeight), _frameGrabber(new FramebufferFrameGrabber(device, grabWidth, grabHeight)), diff --git a/libsrc/grabber/osx/CMakeLists.txt b/libsrc/grabber/osx/CMakeLists.txt index 03868eeb..ca72df4c 100644 --- a/libsrc/grabber/osx/CMakeLists.txt +++ b/libsrc/grabber/osx/CMakeLists.txt @@ -1,34 +1,34 @@ -# Define the current source locations -SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber) -SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/osx) - -# Group the headers that go through the MOC compiler -SET(OsxGrabberQT_HEADERS - ${CURRENT_HEADER_DIR}/OsxWrapper.h -) - -SET(OsxGrabberHEADERS - ${CURRENT_SOURCE_DIR}/OsxFrameGrabber.h -) - -SET(OsxGrabberSOURCES - ${CURRENT_SOURCE_DIR}/OsxWrapper.cpp - ${CURRENT_SOURCE_DIR}/OsxFrameGrabber.cpp -) - -if(ENABLE_QT5) -QT5_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS}) -else(ENABLE_QT5) -QT4_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS}) -endif(ENABLE_QT5) - -add_library(osx-grabber - ${OsxGrabberHEADERS} - ${OsxGrabberQT_HEADERS} - ${OsxGrabberHEADERS_MOC} - ${OsxGrabberSOURCES} -) - -target_link_libraries(osx-grabber - hyperion - ${QT_LIBRARIES}) +# Define the current source locations +SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/grabber) +SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/grabber/osx) + +# Group the headers that go through the MOC compiler +SET(OsxGrabberQT_HEADERS + ${CURRENT_HEADER_DIR}/OsxWrapper.h +) + +SET(OsxGrabberHEADERS + ${CURRENT_HEADER_DIR}/OsxFrameGrabber.h +) + +SET(OsxGrabberSOURCES + ${CURRENT_SOURCE_DIR}/OsxWrapper.cpp + ${CURRENT_SOURCE_DIR}/OsxFrameGrabber.cpp +) + +if(ENABLE_QT5) + QT5_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS}) +else(ENABLE_QT5) + QT4_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS}) +endif(ENABLE_QT5) + +add_library(osx-grabber + ${OsxGrabberHEADERS} + ${OsxGrabberQT_HEADERS} + ${OsxGrabberHEADERS_MOC} + ${OsxGrabberSOURCES} +) + +target_link_libraries(osx-grabber + hyperion + ${QT_LIBRARIES}) diff --git a/libsrc/grabber/osx/OsxFrameGrabber.cpp b/libsrc/grabber/osx/OsxFrameGrabber.cpp index b6c7a2c9..0a8d23fc 100755 --- a/libsrc/grabber/osx/OsxFrameGrabber.cpp +++ b/libsrc/grabber/osx/OsxFrameGrabber.cpp @@ -3,7 +3,7 @@ #include // Local includes -#include "OsxFrameGrabber.h" +#include OsxFrameGrabber::OsxFrameGrabber(const unsigned display, const unsigned width, const unsigned height) : _screenIndex(display), diff --git a/libsrc/grabber/osx/OsxWrapper.cpp b/libsrc/grabber/osx/OsxWrapper.cpp index da8b039e..4111ea0b 100644 --- a/libsrc/grabber/osx/OsxWrapper.cpp +++ b/libsrc/grabber/osx/OsxWrapper.cpp @@ -5,12 +5,12 @@ // Osx grabber includes #include -#include "OsxFrameGrabber.h" +#include -OsxWrapper::OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) : +OsxWrapper::OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, const int priority, Hyperion * hyperion) : _updateInterval_ms(1000/updateRate_Hz), _timeout_ms(2 * _updateInterval_ms), - _priority(1000), + _priority(priority), _timer(), _image(grabWidth, grabHeight), _frameGrabber(new OsxFrameGrabber(display, grabWidth, grabHeight)), diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f55af750..2626ba9b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,15 +3,15 @@ add_subdirectory(hyperion-remote) # The following clients depend on the protobuf library if(ENABLE_PROTOBUF) + if (ENABLE_AMLOGIC) add_subdirectory(hyperion-aml) endif() - # Add the 'Video 4 Linux' grabber if it is enabled + if(ENABLE_V4L2) add_subdirectory(hyperion-v4l2) endif() - # Add the X11 grabber if it is enabled if(ENABLE_X11) add_subdirectory(hyperion-x11) endif() @@ -20,4 +20,12 @@ if(ENABLE_PROTOBUF) add_subdirectory(hyperion-dispmanx) endif() + if(ENABLE_FB) + add_subdirectory(hyperion-framebuffer) + endif() + + if(ENABLE_OSX) + add_subdirectory(hyperion-osx) + endif() + endif() diff --git a/src/hyperion-aml/CMakeLists.txt b/src/hyperion-aml/CMakeLists.txt index cd27c046..9d365560 100644 --- a/src/hyperion-aml/CMakeLists.txt +++ b/src/hyperion-aml/CMakeLists.txt @@ -4,8 +4,12 @@ cmake_minimum_required(VERSION 2.8) # Set the project name project(hyperion-aml) -# find Qt4 -find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) +# find QT +if(ENABLE_QT5) + find_package(Qt5Widgets REQUIRED) +else(ENABLE_QT5) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) +endif(ENABLE_QT5) include_directories( ${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver @@ -31,13 +35,13 @@ else(ENABLE_QT5) QT4_WRAP_CPP(Hyperion_AML_HEADERS_MOC ${Hyperion_AML_QT_HEADERS}) endif(ENABLE_QT5) -add_executable(hyperion-amlogic +add_executable(${PROJECT_NAME} ${Hyperion_AML_HEADERS} ${Hyperion_AML_SOURCES} ${Hyperion_AML_HEADERS_MOC} ) -target_link_libraries(hyperion-amlogic +target_link_libraries(${PROJECT_NAME} getoptPlusPlus blackborder hyperion-utils @@ -46,7 +50,8 @@ target_link_libraries(hyperion-amlogic pthread ) -qt4_use_modules(hyperion-amlogic - Core - Gui - Network) +if(ENABLE_QT5) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +else(ENABLE_QT5) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) +endif(ENABLE_QT5) diff --git a/src/hyperion-aml/hyperion-aml.cpp b/src/hyperion-aml/hyperion-aml.cpp index cca5e688..42870455 100644 --- a/src/hyperion-aml/hyperion-aml.cpp +++ b/src/hyperion-aml/hyperion-aml.cpp @@ -30,9 +30,9 @@ int main(int argc, char ** argv) OptionsParser optionParser("X11 capture application for Hyperion"); ParameterSet & parameters = optionParser.getParameters(); - IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default=10]"); - IntParameter & argWidth = parameters.add (0x0, "width", "Width of the captured image [default=128]"); - IntParameter & argHeight = parameters.add (0x0, "height", "Height of the captured image [default=128]"); + IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default: 10]"); + IntParameter & argWidth = parameters.add (0x0, "width", "Width of the captured image [default: 128]"); + IntParameter & argHeight = parameters.add (0x0, "height", "Height of the captured image [default: 128]"); SwitchParameter<> & argScreenshot = parameters.add> (0x0, "screenshot", "Take a single screenshot, save it to file and quit"); StringParameter & argAddress = parameters.add ('a', "address", "Set the address of the hyperion server [default: 127.0.0.1:19445]"); IntParameter & argPriority = parameters.add ('p', "priority", "Use the provided priority channel (the lower the number, the higher the priority) [default: 800]"); diff --git a/src/hyperion-dispmanx/CMakeLists.txt b/src/hyperion-dispmanx/CMakeLists.txt index 130cb661..6252943c 100644 --- a/src/hyperion-dispmanx/CMakeLists.txt +++ b/src/hyperion-dispmanx/CMakeLists.txt @@ -4,10 +4,10 @@ cmake_minimum_required(VERSION 2.8) # Set the project name project(hyperion-dispmanx) +# find QT if(ENABLE_QT5) find_package(Qt5Widgets REQUIRED) else(ENABLE_QT5) - # find Qt4 find_package(Qt4 REQUIRED QtCore QtGui QtNetwork ) endif(ENABLE_QT5) @@ -55,11 +55,7 @@ target_link_libraries( ${PROJECT_NAME} ) if(ENABLE_QT5) - qt5_use_modules(hyperion-dispmanx Widgets Core Gui Network) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) else(ENABLE_QT5) - qt4_use_modules(hyperion-dispmanx - Core - Gui - Network - ) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) endif(ENABLE_QT5) diff --git a/src/hyperion-dispmanx/hyperion-dispmanx.cpp b/src/hyperion-dispmanx/hyperion-dispmanx.cpp index abf78c8c..e5ebf429 100644 --- a/src/hyperion-dispmanx/hyperion-dispmanx.cpp +++ b/src/hyperion-dispmanx/hyperion-dispmanx.cpp @@ -29,7 +29,7 @@ int main(int argc, char ** argv) OptionsParser optionParser("Dispmanx capture application for Hyperion"); ParameterSet & parameters = optionParser.getParameters(); - IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default=10]"); + IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default: 10]"); IntParameter & argWidth = parameters.add (0x0, "width", "The width of the grabbed frames [pixels]"); IntParameter & argHeight = parameters.add (0x0, "height", "The height of the grabbed frames"); diff --git a/src/hyperion-framebuffer/CMakeLists.txt b/src/hyperion-framebuffer/CMakeLists.txt new file mode 100644 index 00000000..b1e99aa0 --- /dev/null +++ b/src/hyperion-framebuffer/CMakeLists.txt @@ -0,0 +1,57 @@ +# Configure minimum CMAKE version +cmake_minimum_required(VERSION 2.8) + +# Set the project name +project(hyperion-framebuffer) + +# find QT +if(ENABLE_QT5) + find_package(Qt5Widgets REQUIRED) +else(ENABLE_QT5) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork ) +endif(ENABLE_QT5) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver + ${QT_INCLUDES} + ${PROTOBUF_INCLUDE_DIRS} +) + +set(Hyperion_FB_QT_HEADERS + FramebufferWrapper.h +) + +set(Hyperion_FB_HEADERS +) + +set(Hyperion_FB_SOURCES + hyperion-framebuffer.cpp + FramebufferWrapper.cpp +) + +if(ENABLE_QT5) + QT5_WRAP_CPP(Hyperion_FB_HEADERS_MOC ${Hyperion_FB_QT_HEADERS}) +else(ENABLE_QT5) + QT4_WRAP_CPP(Hyperion_FB_HEADERS_MOC ${Hyperion_FB_QT_HEADERS}) +endif(ENABLE_QT5) + +add_executable( ${PROJECT_NAME} + ${Hyperion_FB_HEADERS} + ${Hyperion_FB_SOURCES} + ${Hyperion_FB_HEADERS_MOC} +) + +target_link_libraries( ${PROJECT_NAME} + getoptPlusPlus + blackborder + hyperion-utils + protoserver + framebuffer-grabber + pthread +) + +if(ENABLE_QT5) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +else(ENABLE_QT5) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) +endif(ENABLE_QT5) diff --git a/src/hyperion-framebuffer/FramebufferWrapper.cpp b/src/hyperion-framebuffer/FramebufferWrapper.cpp new file mode 100644 index 00000000..b7d7c7b7 --- /dev/null +++ b/src/hyperion-framebuffer/FramebufferWrapper.cpp @@ -0,0 +1,37 @@ + +// Hyperion-AmLogic includes +#include "FramebufferWrapper.h" + +FramebufferWrapper::FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz) : + _timer(this), + _grabber(device,grabWidth, grabHeight) +{ + _timer.setSingleShot(false); + _timer.setInterval(updateRate_Hz); + + // Connect capturing to the timeout signal of the timer + connect(&_timer, SIGNAL(timeout()), this, SLOT(capture())); +} + +const Image & FramebufferWrapper::getScreenshot() +{ + capture(); + return _screenshot; +} + +void FramebufferWrapper::start() +{ + _timer.start(); +} + +void FramebufferWrapper::stop() +{ + _timer.stop(); +} + +void FramebufferWrapper::capture() +{ + _grabber.grabFrame(_screenshot); + + emit sig_screenshot(_screenshot); +} diff --git a/src/hyperion-framebuffer/FramebufferWrapper.h b/src/hyperion-framebuffer/FramebufferWrapper.h new file mode 100644 index 00000000..b763b52b --- /dev/null +++ b/src/hyperion-framebuffer/FramebufferWrapper.h @@ -0,0 +1,42 @@ + +// QT includes +#include + +// Hyperion-Dispmanx includes +#include + +class FramebufferWrapper : public QObject +{ + Q_OBJECT +public: + FramebufferWrapper(const std::string & device, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz); + + const Image & getScreenshot(); + + /// + /// Starts the timed capturing of screenshots + /// + void start(); + + void stop(); + +signals: + void sig_screenshot(const Image & screenshot); + +private slots: + /// + /// Performs a single screenshot capture and publishes the capture screenshot on the screenshot signal. + /// + void capture(); + +private: + /// The QT timer to generate capture-publish events + QTimer _timer; + + /// The grabber for creating screenshots + FramebufferFrameGrabber _grabber; + + // image buffers + Image _screenshot; + +}; diff --git a/src/hyperion-framebuffer/hyperion-framebuffer.cpp b/src/hyperion-framebuffer/hyperion-framebuffer.cpp new file mode 100644 index 00000000..b4c7f830 --- /dev/null +++ b/src/hyperion-framebuffer/hyperion-framebuffer.cpp @@ -0,0 +1,101 @@ + + +// QT includes +#include +#include + +// getoptPlusPLus includes +#include + +#include +#include "FramebufferWrapper.h" + +using namespace vlofgren; + +// save the image as screenshot +void saveScreenshot(const char * filename, const Image & image) +{ + // store as PNG + QImage pngImage((const uint8_t *) image.memptr(), image.width(), image.height(), 3*image.width(), QImage::Format_RGB888); + pngImage.save(filename); +} + +int main(int argc, char ** argv) +{ + QCoreApplication app(argc, argv); + + try + { + // create the option parser and initialize all parameters + OptionsParser optionParser("X11 capture application for Hyperion"); + ParameterSet & parameters = optionParser.getParameters(); + + StringParameter & argDevice = parameters.add ('d', "device", "Set the video device [default: /dev/video0]"); + IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default: 10]"); + IntParameter & argWidth = parameters.add (0x0, "width", "Width of the captured image [default: 128]"); + IntParameter & argHeight = parameters.add (0x0, "height", "Height of the captured image [default: 128]"); + SwitchParameter<> & argScreenshot = parameters.add> (0x0, "screenshot", "Take a single screenshot, save it to file and quit"); + StringParameter & argAddress = parameters.add ('a', "address", "Set the address of the hyperion server [default: 127.0.0.1:19445]"); + IntParameter & argPriority = parameters.add ('p', "priority", "Use the provided priority channel (the lower the number, the higher the priority) [default: 800]"); + SwitchParameter<> & argSkipReply = parameters.add> (0x0, "skip-reply", "Do not receive and check reply messages from Hyperion"); + SwitchParameter<> & argHelp = parameters.add> ('h', "help", "Show this help message and exit"); + + // set defaults + argFps.setDefault(10); + argWidth.setDefault(160); + argHeight.setDefault(160); + argAddress.setDefault("127.0.0.1:19445"); + argPriority.setDefault(800); + argDevice.setDefault("/dev/video0"); + + // parse all options + optionParser.parse(argc, const_cast(argv)); + + // check if we need to display the usage. exit if we do. + if (argHelp.isSet()) + { + optionParser.usage(); + return 0; + } + + int width = argWidth.getValue(); + int height = argHeight.getValue(); + if (width < 160 || height < 160) + { + std::cout << "Minimum width and height is 160" << std::endl; + width = std::max(160, width); + height = std::max(160, height); + } + + int grabInterval = 1000 / argFps.getValue(); + FramebufferWrapper fbWrapper(argDevice.getValue(), argWidth.getValue(), argHeight.getValue(), grabInterval); + + if (argScreenshot.isSet()) + { + // Capture a single screenshot and finish + const Image & screenshot = fbWrapper.getScreenshot(); + saveScreenshot("screenshot.png", screenshot); + } + else + { + // Create the Proto-connection with hyperiond + ProtoConnectionWrapper protoWrapper(argAddress.getValue(), argPriority.getValue(), 1000, argSkipReply.isSet()); + + // Connect the screen capturing to the proto processing + QObject::connect(&fbWrapper, SIGNAL(sig_screenshot(const Image &)), &protoWrapper, SLOT(receiveImage(Image))); + + // Start the capturing + fbWrapper.start(); + + // Start the application + app.exec(); + } + } + catch (const std::runtime_error & e) + { + // An error occured. Display error and quit + std::cerr << e.what() << std::endl; + return -1; + } + return 0; +} diff --git a/src/hyperion-osx/CMakeLists.txt b/src/hyperion-osx/CMakeLists.txt new file mode 100644 index 00000000..e7143042 --- /dev/null +++ b/src/hyperion-osx/CMakeLists.txt @@ -0,0 +1,57 @@ +# Configure minimum CMAKE version +cmake_minimum_required(VERSION 2.8) + +# Set the project name +project(hyperion-osx) + +# find QT +if(ENABLE_QT5) + find_package(Qt5Widgets REQUIRED) +else(ENABLE_QT5) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork ) +endif(ENABLE_QT5) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR}/../../libsrc/protoserver + ${QT_INCLUDES} + ${PROTOBUF_INCLUDE_DIRS} +) + +set(Hyperion_OSX_QT_HEADERS + OsxWrapper.h +) + +set(Hyperion_OSX_HEADERS +) + +set(Hyperion_OSX_SOURCES + hyperion-osx.cpp + OsxWrapper.cpp +) + +if(ENABLE_QT5) + QT5_WRAP_CPP(Hyperion_OSX_HEADERS_MOC ${Hyperion_OSX_QT_HEADERS}) +else(ENABLE_QT5) + QT4_WRAP_CPP(Hyperion_OSX_HEADERS_MOC ${Hyperion_OSX_QT_HEADERS}) +endif(ENABLE_QT5) + +add_executable( ${PROJECT_NAME} + ${Hyperion_OSX_HEADERS} + ${Hyperion_OSX_SOURCES} + ${Hyperion_OSX_HEADERS_MOC} +) + +target_link_libraries( ${PROJECT_NAME} + getoptPlusPlus + blackborder + hyperion-utils + protoserver + osx-grabber + pthread +) + +if(ENABLE_QT5) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +else(ENABLE_QT5) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) +endif(ENABLE_QT5) diff --git a/src/hyperion-osx/OsxWrapper.cpp b/src/hyperion-osx/OsxWrapper.cpp new file mode 100644 index 00000000..eb9256c2 --- /dev/null +++ b/src/hyperion-osx/OsxWrapper.cpp @@ -0,0 +1,36 @@ + +// Hyperion-AmLogic includes +#include "OsxWrapper.h" + +OsxWrapper::OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz) : + _timer(this), + _grabber(display,grabWidth, grabHeight) +{ + _timer.setSingleShot(false); + _timer.setInterval(updateRate_Hz); + + // Connect capturing to the timeout signal of the timer + connect(&_timer, SIGNAL(timeout()), this, SLOT(capture())); +} + +const Image & OsxWrapper::getScreenshot() +{ + capture(); + return _screenshot; +} + +void OsxWrapper::start() +{ + _timer.start(); +} + +void OsxWrapper::stop() +{ + _timer.stop(); +} + +void OsxWrapper::capture() +{ + _grabber.grabFrame(_screenshot); + emit sig_screenshot(_screenshot); +} diff --git a/src/hyperion-osx/OsxWrapper.h b/src/hyperion-osx/OsxWrapper.h new file mode 100644 index 00000000..9ff4c956 --- /dev/null +++ b/src/hyperion-osx/OsxWrapper.h @@ -0,0 +1,42 @@ + +// QT includes +#include + +// Hyperion-Dispmanx includes +#include + +class OsxWrapper : public QObject +{ + Q_OBJECT +public: + OsxWrapper(const unsigned display, const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz); + + const Image & getScreenshot(); + + /// + /// Starts the timed capturing of screenshots + /// + void start(); + + void stop(); + +signals: + void sig_screenshot(const Image & screenshot); + +private slots: + /// + /// Performs a single screenshot capture and publishes the capture screenshot on the screenshot signal. + /// + void capture(); + +private: + /// The QT timer to generate capture-publish events + QTimer _timer; + + /// The grabber for creating screenshots + OsxFrameGrabber _grabber; + + // image buffers + Image _screenshot; + +}; diff --git a/src/hyperion-osx/hyperion-osx.cpp b/src/hyperion-osx/hyperion-osx.cpp new file mode 100644 index 00000000..dbb51575 --- /dev/null +++ b/src/hyperion-osx/hyperion-osx.cpp @@ -0,0 +1,101 @@ + + +// QT includes +#include +#include + +// getoptPlusPLus includes +#include + +#include +#include "OsxWrapper.h" + +using namespace vlofgren; + +// save the image as screenshot +void saveScreenshot(const char * filename, const Image & image) +{ + // store as PNG + QImage pngImage((const uint8_t *) image.memptr(), image.width(), image.height(), 3*image.width(), QImage::Format_RGB888); + pngImage.save(filename); +} + +int main(int argc, char ** argv) +{ + QCoreApplication app(argc, argv); + + try + { + // create the option parser and initialize all parameters + OptionsParser optionParser("X11 capture application for Hyperion"); + ParameterSet & parameters = optionParser.getParameters(); + + IntParameter & argDisplay = parameters.add ('d', "display", "Set the display to capture [default: 0]"); + IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default: 10]"); + IntParameter & argWidth = parameters.add (0x0, "width", "Width of the captured image [default: 128]"); + IntParameter & argHeight = parameters.add (0x0, "height", "Height of the captured image [default: 128]"); + SwitchParameter<> & argScreenshot = parameters.add> (0x0, "screenshot", "Take a single screenshot, save it to file and quit"); + StringParameter & argAddress = parameters.add ('a', "address", "Set the address of the hyperion server [default: 127.0.0.1:19445]"); + IntParameter & argPriority = parameters.add ('p', "priority", "Use the provided priority channel (the lower the number, the higher the priority) [default: 800]"); + SwitchParameter<> & argSkipReply = parameters.add> (0x0, "skip-reply", "Do not receive and check reply messages from Hyperion"); + SwitchParameter<> & argHelp = parameters.add> ('h', "help", "Show this help message and exit"); + + // set defaults + argFps.setDefault(10); + argWidth.setDefault(160); + argHeight.setDefault(160); + argAddress.setDefault("127.0.0.1:19445"); + argPriority.setDefault(800); + argDisplay.setDefault(0); + + // parse all options + optionParser.parse(argc, const_cast(argv)); + + // check if we need to display the usage. exit if we do. + if (argHelp.isSet()) + { + optionParser.usage(); + return 0; + } + + int width = argWidth.getValue(); + int height = argHeight.getValue(); + if (width < 160 || height < 160) + { + std::cout << "Minimum width and height is 160" << std::endl; + width = std::max(160, width); + height = std::max(160, height); + } + + int grabInterval = 1000 / argFps.getValue(); + OsxWrapper osxWrapper(argDisplay.getValue(), argWidth.getValue(), argHeight.getValue(), grabInterval); + + if (argScreenshot.isSet()) + { + // Capture a single screenshot and finish + const Image & screenshot = osxWrapper.getScreenshot(); + saveScreenshot("screenshot.png", screenshot); + } + else + { + // Create the Proto-connection with hyperiond + ProtoConnectionWrapper protoWrapper(argAddress.getValue(), argPriority.getValue(), 1000, argSkipReply.isSet()); + + // Connect the screen capturing to the proto processing + QObject::connect(&osxWrapper, SIGNAL(sig_screenshot(const Image &)), &protoWrapper, SLOT(receiveImage(Image))); + + // Start the capturing + osxWrapper.start(); + + // Start the application + app.exec(); + } + } + catch (const std::runtime_error & e) + { + // An error occured. Display error and quit + std::cerr << e.what() << std::endl; + return -1; + } + return 0; +} diff --git a/src/hyperion-remote/CMakeLists.txt b/src/hyperion-remote/CMakeLists.txt index b8c73a59..3e36d2b2 100644 --- a/src/hyperion-remote/CMakeLists.txt +++ b/src/hyperion-remote/CMakeLists.txt @@ -1,41 +1,43 @@ -cmake_minimum_required(VERSION 2.8) - -project(hyperion-remote) - -# find Qt4 -if(ENABLE_QT5) -find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -# set(CMAKE_CXX_FLAGS "-fPIC") -else(ENABLE_QT5) -find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) -endif(ENABLE_QT5) - -# 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) - -include_directories(${QT_INCLUDES}) - -set(hyperion-remote_HEADERS - CustomParameter.h - JsonConnection.h - ColorTransformValues.h) - -set(hyperion-remote_SOURCES - hyperion-remote.cpp - JsonConnection.cpp) - -add_executable(hyperion-remote - ${hyperion-remote_HEADERS} - ${hyperion-remote_SOURCES}) - -if(ENABLE_QT5) -qt5_use_modules(hyperion-remote Widgets Network) -endif(ENABLE_QT5) - -target_link_libraries(hyperion-remote - jsoncpp - getoptPlusPlus - ${QT_LIBRARIES}) +cmake_minimum_required(VERSION 2.8) + +project(hyperion-remote) + +# find Qt +if(ENABLE_QT5) + find_package(Qt5 COMPONENTS Core Gui Widgets Network REQUIRED) +# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") +# set(CMAKE_CXX_FLAGS "-fPIC") +else(ENABLE_QT5) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) +endif(ENABLE_QT5) + +# 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) + +include_directories(${QT_INCLUDES}) + +set(hyperion-remote_HEADERS + CustomParameter.h + JsonConnection.h + ColorTransformValues.h) + +set(hyperion-remote_SOURCES + hyperion-remote.cpp + JsonConnection.cpp) + +add_executable(${PROJECT_NAME} + ${hyperion-remote_HEADERS} + ${hyperion-remote_SOURCES}) + +target_link_libraries(${PROJECT_NAME} + jsoncpp + getoptPlusPlus + ${QT_LIBRARIES}) + +if(ENABLE_QT5) + qt5_use_modules(${PROJECT_NAME} Widgets Core Network) +else(ENABLE_QT5) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) +endif(ENABLE_QT5) diff --git a/src/hyperion-v4l2/CMakeLists.txt b/src/hyperion-v4l2/CMakeLists.txt index ef051e2d..22e512b2 100644 --- a/src/hyperion-v4l2/CMakeLists.txt +++ b/src/hyperion-v4l2/CMakeLists.txt @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 2.8) project(hyperion-v4l2) -# find Qt4 +# find Qt if(ENABLE_QT5) -find_package(Qt5Widgets REQUIRED) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") -# set(CMAKE_CXX_FLAGS "-fPIC") + find_package(Qt5Widgets REQUIRED) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") +# set(CMAKE_CXX_FLAGS "-fPIC") else(ENABLE_QT5) -find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) endif(ENABLE_QT5) @@ -32,19 +32,19 @@ set(Hyperion_V4L2_SOURCES ScreenshotHandler.cpp ) if(ENABLE_QT5) -QT5_WRAP_CPP(Hyperion_V4L2_MOC_SOURCES ${Hyperion_V4L2_QT_HEADERS}) + QT5_WRAP_CPP(Hyperion_V4L2_MOC_SOURCES ${Hyperion_V4L2_QT_HEADERS}) else(ENABLE_QT5) -QT4_WRAP_CPP(Hyperion_V4L2_MOC_SOURCES ${Hyperion_V4L2_QT_HEADERS}) + QT4_WRAP_CPP(Hyperion_V4L2_MOC_SOURCES ${Hyperion_V4L2_QT_HEADERS}) endif(ENABLE_QT5) -add_executable(hyperion-v4l2 +add_executable(${PROJECT_NAME} ${Hyperion_V4L2_HEADERS} ${Hyperion_V4L2_SOURCES} ${Hyperion_V4L2_QT_HEADERS} ${Hyperion_V4L2_MOC_SOURCES} ) -target_link_libraries(hyperion-v4l2 +target_link_libraries(${PROJECT_NAME} v4l2-grabber getoptPlusPlus blackborder @@ -53,3 +53,9 @@ target_link_libraries(hyperion-v4l2 pthread ${QT_LIBRARIES} ) + +if(ENABLE_QT5) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) +else(ENABLE_QT5) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) +endif(ENABLE_QT5) diff --git a/src/hyperion-v4l2/hyperion-v4l2.cpp b/src/hyperion-v4l2/hyperion-v4l2.cpp index fe011f6d..ed56dbb7 100644 --- a/src/hyperion-v4l2/hyperion-v4l2.cpp +++ b/src/hyperion-v4l2/hyperion-v4l2.cpp @@ -51,14 +51,14 @@ int main(int argc, char** argv) OptionsParser optionParser("V4L capture application for Hyperion"); ParameterSet & parameters = optionParser.getParameters(); - StringParameter & argDevice = parameters.add ('d', "device", "The device to use [default=/dev/video0]"); + StringParameter & argDevice = parameters.add ('d', "device", "The device to use [default: /dev/video0]"); VideoStandardParameter & argVideoStandard = parameters.add('v', "video-standard", "The used video standard. Valid values are PAL or NTSC (optional)"); PixelFormatParameter & argPixelFormat = parameters.add (0x0, "pixel-format", "The use pixel format. Valid values are YUYV, UYVY, and RGB32 (optional)"); IntParameter & argInput = parameters.add (0x0, "input", "Input channel (optional)"); IntParameter & argWidth = parameters.add (0x0, "width", "Try to set the width of the video input (optional)"); IntParameter & argHeight = parameters.add (0x0, "height", "Try to set the height of the video input (optional)"); - IntParameter & argCropWidth = parameters.add (0x0, "crop-width", "Number of pixels to crop from the left and right sides of the picture before decimation [default=0]"); - IntParameter & argCropHeight = parameters.add (0x0, "crop-height", "Number of pixels to crop from the top and the bottom of the picture before decimation [default=0]"); + IntParameter & argCropWidth = parameters.add (0x0, "crop-width", "Number of pixels to crop from the left and right sides of the picture before decimation [default: 0]"); + IntParameter & argCropHeight = parameters.add (0x0, "crop-height", "Number of pixels to crop from the top and the bottom of the picture before decimation [default: 0]"); IntParameter & argCropLeft = parameters.add (0x0, "crop-left", "Number of pixels to crop from the left of the picture before decimation (overrides --crop-width)"); IntParameter & argCropRight = parameters.add (0x0, "crop-right", "Number of pixels to crop from the right of the picture before decimation (overrides --crop-width)"); IntParameter & argCropTop = parameters.add (0x0, "crop-top", "Number of pixels to crop from the top of the picture before decimation (overrides --crop-height)"); diff --git a/src/hyperion-x11/CMakeLists.txt b/src/hyperion-x11/CMakeLists.txt index 626781f9..13e1e1a6 100644 --- a/src/hyperion-x11/CMakeLists.txt +++ b/src/hyperion-x11/CMakeLists.txt @@ -4,11 +4,11 @@ cmake_minimum_required(VERSION 2.8) # Set the project name project(hyperion-x11) +# find QT if(ENABLE_QT5) -find_package(Qt5Widgets REQUIRED) + find_package(Qt5Widgets REQUIRED) else(ENABLE_QT5) -# find Qt4 -find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) + find_package(Qt4 REQUIRED QtCore QtGui QtNetwork) endif(ENABLE_QT5) # Find X11 @@ -33,18 +33,19 @@ set(Hyperion_X11_SOURCES ) if(ENABLE_QT5) -QT5_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS}) + QT5_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS}) else(ENABLE_QT5) -QT4_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS}) + QT4_WRAP_CPP(Hyperion_X11_HEADERS_MOC ${Hyperion_X11_QT_HEADERS}) endif(ENABLE_QT5) -add_executable(hyperion-x11 + +add_executable(${PROJECT_NAME} ${Hyperion_X11_HEADERS} ${Hyperion_X11_SOURCES} ${Hyperion_X11_HEADERS_MOC} ) -target_link_libraries(hyperion-x11 +target_link_libraries(${PROJECT_NAME} getoptPlusPlus blackborder hyperion-utils @@ -55,10 +56,7 @@ target_link_libraries(hyperion-x11 ) if(ENABLE_QT5) -qt5_use_modules(hyperion-x11 Widgets Core Gui Network) + qt5_use_modules(${PROJECT_NAME} Widgets Core Gui Network) else(ENABLE_QT5) -qt4_use_modules(hyperion-x11 - Core - Gui - Network) + qt4_use_modules(${PROJECT_NAME} Core Gui Network ) endif(ENABLE_QT5) diff --git a/src/hyperion-x11/hyperion-x11.cpp b/src/hyperion-x11/hyperion-x11.cpp index 7815aa34..42853af1 100644 --- a/src/hyperion-x11/hyperion-x11.cpp +++ b/src/hyperion-x11/hyperion-x11.cpp @@ -29,9 +29,9 @@ int main(int argc, char ** argv) OptionsParser optionParser("X11 capture application for Hyperion"); ParameterSet & parameters = optionParser.getParameters(); - IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default=10]"); - IntParameter & argCropWidth = parameters.add (0x0, "crop-width", "Number of pixels to crop from the left and right sides of the picture before decimation [default=0]"); - IntParameter & argCropHeight = parameters.add (0x0, "crop-height", "Number of pixels to crop from the top and the bottom of the picture before decimation [default=0]"); + IntParameter & argFps = parameters.add ('f', "framerate", "Capture frame rate [default: 10]"); + IntParameter & argCropWidth = parameters.add (0x0, "crop-width", "Number of pixels to crop from the left and right sides of the picture before decimation [default: 0]"); + IntParameter & argCropHeight = parameters.add (0x0, "crop-height", "Number of pixels to crop from the top and the bottom of the picture before decimation [default: 0]"); IntParameter & argCropLeft = parameters.add (0x0, "crop-left", "Number of pixels to crop from the left of the picture before decimation (overrides --crop-width)"); IntParameter & argCropRight = parameters.add (0x0, "crop-right", "Number of pixels to crop from the right of the picture before decimation (overrides --crop-width)"); IntParameter & argCropTop = parameters.add (0x0, "crop-top", "Number of pixels to crop from the top of the picture before decimation (overrides --crop-height)"); diff --git a/src/hyperiond/hyperiond.cpp b/src/hyperiond/hyperiond.cpp index 8af26879..2f59c5c9 100644 --- a/src/hyperiond/hyperiond.cpp +++ b/src/hyperiond/hyperiond.cpp @@ -127,7 +127,7 @@ int main(int argc, char** argv) // Get the parameters for the bootsequence const std::string effectName = effectConfig["effect"].asString(); const unsigned duration_ms = effectConfig["duration_ms"].asUInt(); - const int priority = effectConfig["priority"].asUInt(); + const int priority = effectConfig.get("priority",990).asInt(); const int bootcolor_priority = (priority > 990) ? priority+1 : 990; if ( ! effectConfig["color"].isNull() && effectConfig["color"].isArray() && effectConfig["color"].size() == 3 ) @@ -216,7 +216,7 @@ int main(int argc, char** argv) if (config.isMember("boblightServer")) { const Json::Value & boblightServerConfig = config["boblightServer"]; - boblightServer = new BoblightServer(&hyperion, boblightServerConfig["port"].asUInt()); + boblightServer = new BoblightServer(&hyperion, boblightServerConfig.get("priority",900).asInt(), boblightServerConfig["port"].asUInt()); std::cout << "Boblight server created and started on port " << boblightServer->getPort() << std::endl; } @@ -232,6 +232,7 @@ int main(int argc, char** argv) frameGrabberConfig["width"].asUInt(), frameGrabberConfig["height"].asUInt(), frameGrabberConfig["frequency_Hz"].asUInt(), + frameGrabberConfig.get("priority",900).asInt(), &hyperion); if (xbmcVideoChecker != nullptr) @@ -275,7 +276,7 @@ int main(int argc, char** argv) grabberConfig.get("greenSignalThreshold", 0.0).asDouble(), grabberConfig.get("blueSignalThreshold", 0.0).asDouble(), &hyperion, - grabberConfig.get("priority", 800).asInt()); + grabberConfig.get("priority", 900).asInt()); v4l2Grabber->set3D(parse3DMode(grabberConfig.get("mode", "2D").asString())); v4l2Grabber->setCropping( grabberConfig.get("cropLeft", 0).asInt(), @@ -308,6 +309,7 @@ int main(int argc, char** argv) grabberConfig["width"].asUInt(), grabberConfig["height"].asUInt(), grabberConfig["frequency_Hz"].asUInt(), + grabberConfig.get("priority",900).asInt(), &hyperion); if (xbmcVideoChecker != nullptr) @@ -341,6 +343,7 @@ int main(int argc, char** argv) grabberConfig["width"].asUInt(), grabberConfig["height"].asUInt(), grabberConfig["frequency_Hz"].asUInt(), + grabberConfig.get("priority",900).asInt(), &hyperion); if (xbmcVideoChecker != nullptr) @@ -376,11 +379,12 @@ int main(int argc, char** argv) { const Json::Value & grabberConfig = config.isMember("osxgrabber")? config["osxgrabber"] : config["framegrabber"]; osxGrabber = new OsxWrapper( - grabberConfig.get("display", 0).asUInt(), - grabberConfig["width"].asUInt(), - grabberConfig["height"].asUInt(), - grabberConfig["frequency_Hz"].asUInt(), - &hyperion); + grabberConfig.get("display", 0).asUInt(), + grabberConfig["width"].asUInt(), + grabberConfig["height"].asUInt(), + grabberConfig["frequency_Hz"].asUInt(), + grabberConfig.get("priority",900).asInt(), + &hyperion ); if (xbmcVideoChecker != nullptr) {