mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2023-10-10 13:36:59 +02:00
big code cleanup. mostly line endings and indentions (#659)
No functional changes - except protobuffer is mandatory and not optional now. Former-commit-id: 1e6347e708707cc388cdedb8d0352a9f017030b8
This commit is contained in:
parent
667ee80ef6
commit
945f3d1c5b
@ -51,8 +51,7 @@ message(STATUS "ENABLE_FB = " ${ENABLE_FB})
|
|||||||
option(ENABLE_OSX "Enable the osx grabber" ${DEFAULT_OSX} )
|
option(ENABLE_OSX "Enable the osx grabber" ${DEFAULT_OSX} )
|
||||||
message(STATUS "ENABLE_OSX = " ${ENABLE_OSX})
|
message(STATUS "ENABLE_OSX = " ${ENABLE_OSX})
|
||||||
|
|
||||||
option(ENABLE_PROTOBUF "Enable PROTOBUF server" ON)
|
set(ENABLE_PROTOBUF ON)
|
||||||
message(STATUS "ENABLE_PROTOBUF = " ${ENABLE_PROTOBUF})
|
|
||||||
|
|
||||||
option(ENABLE_SPIDEV "Enable the SPIDEV device" ${DEFAULT_SPIDEV} )
|
option(ENABLE_SPIDEV "Enable the SPIDEV device" ${DEFAULT_SPIDEV} )
|
||||||
message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
|
message(STATUS "ENABLE_SPIDEV = " ${ENABLE_SPIDEV})
|
||||||
@ -78,9 +77,6 @@ message(STATUS "ENABLE_QT5 = " ${ENABLE_QT5})
|
|||||||
option(ENABLE_TESTS "Compile additional test applications" OFF)
|
option(ENABLE_TESTS "Compile additional test applications" OFF)
|
||||||
message(STATUS "ENABLE_TESTS = " ${ENABLE_TESTS})
|
message(STATUS "ENABLE_TESTS = " ${ENABLE_TESTS})
|
||||||
|
|
||||||
if(ENABLE_V4L2 AND NOT ENABLE_PROTOBUF)
|
|
||||||
message(FATAL_ERROR "V4L2 grabber requires PROTOBUF. Disable V4L2 or enable PROTOBUF")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_FB AND ENABLE_DISPMANX)
|
if(ENABLE_FB AND ENABLE_DISPMANX)
|
||||||
message(FATAL_ERROR "dispmanx grabber and framebuffer grabber cannot be used at the same time")
|
message(FATAL_ERROR "dispmanx grabber and framebuffer grabber cannot be used at the same time")
|
||||||
|
@ -26,21 +26,22 @@ echo '**************************************************************************
|
|||||||
|
|
||||||
#Skip the prompt if HyperCon Remove
|
#Skip the prompt if HyperCon Remove
|
||||||
if [ "$1" = "" ]; then
|
if [ "$1" = "" ]; then
|
||||||
#Prompt for confirmation to proceed
|
#Prompt for confirmation to proceed
|
||||||
while true
|
while true
|
||||||
do
|
do
|
||||||
echo -n "---> Do you really want to remove Hyperion and it´s services? (y or n) :"
|
echo -n "---> Do you really want to remove Hyperion and it´s services? (y or n) :"
|
||||||
read CONFIRM
|
read CONFIRM
|
||||||
case $CONFIRM in
|
case $CONFIRM in
|
||||||
y|Y|YES|yes|Yes) break ;;
|
y|Y|YES|yes|Yes) break ;;
|
||||||
n|N|no|NO|No)
|
n|N|no|NO|No)
|
||||||
echo "---> Aborting - you entered \"$CONFIRM\""
|
echo "---> Aborting - you entered \"$CONFIRM\""
|
||||||
exit
|
exit
|
||||||
;;
|
;;
|
||||||
*) echo "-> Please enter only y or n"
|
*) echo "-> Please enter only y or n"
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
echo "---> You entered \"$CONFIRM\". Remove Hyperion!"
|
|
||||||
|
echo "---> You entered \"$CONFIRM\". Remove Hyperion!"
|
||||||
fi
|
fi
|
||||||
# Find out if we are on OpenElec or RasPlex
|
# Find out if we are on OpenElec or RasPlex
|
||||||
OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue`
|
OS_OPENELEC=`grep -m1 -c 'OpenELEC\|RasPlex\|LibreELEC' /etc/issue`
|
||||||
@ -124,4 +125,3 @@ echo '**************************************************************************
|
|||||||
echo 'Hyperion successful removed!'
|
echo 'Hyperion successful removed!'
|
||||||
echo '*******************************************************************************'
|
echo '*******************************************************************************'
|
||||||
exit 0
|
exit 0
|
||||||
|
|
@ -17,5 +17,5 @@ if(APPLE)
|
|||||||
set(CoreFoundation_FOUND true)
|
set(CoreFoundation_FOUND true)
|
||||||
set(CoreFoundation_INCLUDE_DIR ${CoreFoundation})
|
set(CoreFoundation_INCLUDE_DIR ${CoreFoundation})
|
||||||
set(CoreFoundation_LIBRARY ${CoreFoundation})
|
set(CoreFoundation_LIBRARY ${CoreFoundation})
|
||||||
endif(CoreFoundation)
|
endif()
|
||||||
endif(APPLE)
|
endif()
|
||||||
|
@ -32,16 +32,16 @@ IF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR)
|
|||||||
# retvale is 0 of the condition is "true" so we need to negate the value...
|
# retvale is 0 of the condition is "true" so we need to negate the value...
|
||||||
if (UDEV_STABLE)
|
if (UDEV_STABLE)
|
||||||
set(UDEV_STABLE 0)
|
set(UDEV_STABLE 0)
|
||||||
else (UDEV_STABLE)
|
else ()
|
||||||
set(UDEV_STABLE 1)
|
set(UDEV_STABLE 1)
|
||||||
endif (UDEV_STABLE)
|
endif ()
|
||||||
message(STATUS "libudev stable: ${UDEV_STABLE}")
|
message(STATUS "libudev stable: ${UDEV_STABLE}")
|
||||||
ENDIF (UDEV_LIBRARIES AND UDEV_INCLUDE_DIR)
|
ENDIF ()
|
||||||
|
|
||||||
IF (UDEV_FOUND)
|
IF (UDEV_FOUND)
|
||||||
MESSAGE(STATUS "Found UDev: ${UDEV_LIBRARIES}")
|
MESSAGE(STATUS "Found UDev: ${UDEV_LIBRARIES}")
|
||||||
MESSAGE(STATUS " include: ${UDEV_INCLUDE_DIR}")
|
MESSAGE(STATUS " include: ${UDEV_INCLUDE_DIR}")
|
||||||
ELSE (UDEV_FOUND)
|
ELSE ()
|
||||||
MESSAGE(STATUS "UDev not found.")
|
MESSAGE(STATUS "UDev not found.")
|
||||||
MESSAGE(STATUS "UDev: You can specify includes: -DUDEV_PATH_INCLUDES=/opt/udev/include")
|
MESSAGE(STATUS "UDev: You can specify includes: -DUDEV_PATH_INCLUDES=/opt/udev/include")
|
||||||
MESSAGE(STATUS " currently found includes: ${UDEV_INCLUDE_DIR}")
|
MESSAGE(STATUS " currently found includes: ${UDEV_INCLUDE_DIR}")
|
||||||
@ -49,5 +49,5 @@ ELSE (UDEV_FOUND)
|
|||||||
MESSAGE(STATUS " currently found libs: ${UDEV_LIBRARIES}")
|
MESSAGE(STATUS " currently found libs: ${UDEV_LIBRARIES}")
|
||||||
IF (UDev_FIND_REQUIRED)
|
IF (UDev_FIND_REQUIRED)
|
||||||
MESSAGE(FATAL_ERROR "Could not find UDev library")
|
MESSAGE(FATAL_ERROR "Could not find UDev library")
|
||||||
ENDIF (UDev_FIND_REQUIRED)
|
ENDIF ()
|
||||||
ENDIF (UDEV_FOUND)
|
ENDIF ()
|
||||||
|
@ -69,12 +69,8 @@ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
|
|||||||
/sw/lib
|
/sw/lib
|
||||||
)
|
)
|
||||||
|
|
||||||
set(LIBUSB_1_INCLUDE_DIRS
|
set(LIBUSB_1_INCLUDE_DIRS ${LIBUSB_1_INCLUDE_DIR} )
|
||||||
${LIBUSB_1_INCLUDE_DIR}
|
set(LIBUSB_1_LIBRARIES ${LIBUSB_1_LIBRARY} )
|
||||||
)
|
|
||||||
set(LIBUSB_1_LIBRARIES
|
|
||||||
${LIBUSB_1_LIBRARY}
|
|
||||||
)
|
|
||||||
|
|
||||||
if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
|
if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
|
||||||
set(LIBUSB_1_FOUND TRUE)
|
set(LIBUSB_1_FOUND TRUE)
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
class ProtoConnection : public QObject
|
class ProtoConnection : public QObject
|
||||||
{
|
{
|
||||||
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
///
|
///
|
||||||
|
@ -22,8 +22,7 @@ public:
|
|||||||
|
|
||||||
void set3D(VideoMode mode);
|
void set3D(VideoMode mode);
|
||||||
|
|
||||||
void processImage(const uint8_t * data, int width, int height, int lineLength, PixelFormat pixelFormat,
|
void processImage(const uint8_t * data, int width, int height, int lineLength, PixelFormat pixelFormat, Image<ColorRgb> & outputImage) const;
|
||||||
Image<ColorRgb> & outputImage) const;
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static inline uint8_t clamp(int x);
|
static inline uint8_t clamp(int x);
|
||||||
|
@ -9,7 +9,7 @@ add_subdirectory(jsonserver)
|
|||||||
|
|
||||||
if (ENABLE_PROTOBUF)
|
if (ENABLE_PROTOBUF)
|
||||||
add_subdirectory(protoserver)
|
add_subdirectory(protoserver)
|
||||||
endif (ENABLE_PROTOBUF)
|
endif ()
|
||||||
|
|
||||||
add_subdirectory(boblightserver)
|
add_subdirectory(boblightserver)
|
||||||
add_subdirectory(leddevice)
|
add_subdirectory(leddevice)
|
||||||
|
@ -18,10 +18,10 @@ set(BoblightServer_SOURCES
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_wrap_cpp(BoblightServer_HEADERS_MOC ${BoblightServer_QT_HEADERS})
|
qt5_wrap_cpp(BoblightServer_HEADERS_MOC ${BoblightServer_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
qt4_wrap_cpp(BoblightServer_HEADERS_MOC ${BoblightServer_QT_HEADERS})
|
qt4_wrap_cpp(BoblightServer_HEADERS_MOC ${BoblightServer_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(boblightserver
|
add_library(boblightserver
|
||||||
${BoblightServer_HEADERS}
|
${BoblightServer_HEADERS}
|
||||||
@ -31,8 +31,8 @@ add_library(boblightserver
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(boblightserver Widgets)
|
qt5_use_modules(boblightserver Widgets)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(boblightserver
|
target_link_libraries(boblightserver
|
||||||
hyperion
|
hyperion
|
||||||
|
@ -26,16 +26,15 @@ SET(EffectEngineSOURCES
|
|||||||
${CURRENT_SOURCE_DIR}/Effect.cpp
|
${CURRENT_SOURCE_DIR}/Effect.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
set(EffectEngine_RESOURCES ${CURRENT_SOURCE_DIR}/EffectEngine.qrc)
|
set(EffectEngine_RESOURCES ${CURRENT_SOURCE_DIR}/EffectEngine.qrc)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
|
QT5_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
|
||||||
qt5_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} OPTIONS "-no-compress")
|
qt5_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} OPTIONS "-no-compress")
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
|
QT4_WRAP_CPP(EffectEngineHEADERS_MOC ${EffectEngineQT_HEADERS})
|
||||||
qt4_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} OPTIONS "-no-compress")
|
qt4_add_resources(EffectEngine_RESOURCES_RCC ${EffectEngine_RESOURCES} OPTIONS "-no-compress")
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(effectengine
|
add_library(effectengine
|
||||||
${EffectEngineHEADERS}
|
${EffectEngineHEADERS}
|
||||||
@ -46,8 +45,8 @@ add_library(effectengine
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(effectengine Widgets)
|
qt5_use_modules(effectengine Widgets)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(effectengine
|
target_link_libraries(effectengine
|
||||||
hyperion
|
hyperion
|
||||||
|
@ -23,9 +23,9 @@ SET(DispmanxGrabberSOURCES
|
|||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
QT5_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
QT4_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(dispmanx-grabber
|
add_library(dispmanx-grabber
|
||||||
${DispmanxGrabberHEADERS}
|
${DispmanxGrabberHEADERS}
|
||||||
|
@ -23,9 +23,9 @@ SET(FramebufferGrabberSOURCES
|
|||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS})
|
QT5_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS})
|
QT4_WRAP_CPP(FramebufferGrabberHEADERS_MOC ${FramebufferGrabberQT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(framebuffer-grabber
|
add_library(framebuffer-grabber
|
||||||
${FramebufferGrabberHEADERS}
|
${FramebufferGrabberHEADERS}
|
||||||
|
@ -18,9 +18,9 @@ SET(OsxGrabberSOURCES
|
|||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
|
QT5_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
|
QT4_WRAP_CPP(OsxGrabberHEADERS_MOC ${OsxGrabberQT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(osx-grabber
|
add_library(osx-grabber
|
||||||
${OsxGrabberHEADERS}
|
${OsxGrabberHEADERS}
|
||||||
|
@ -17,10 +17,10 @@ SET(V4L2_SOURCES
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(V4L2_HEADERS_MOC ${V4L2_QT_HEADERS})
|
QT5_WRAP_CPP(V4L2_HEADERS_MOC ${V4L2_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(V4L2_HEADERS_MOC ${V4L2_QT_HEADERS})
|
QT4_WRAP_CPP(V4L2_HEADERS_MOC ${V4L2_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(v4l2-grabber
|
add_library(v4l2-grabber
|
||||||
${V4L2_HEADERS}
|
${V4L2_HEADERS}
|
||||||
|
@ -23,10 +23,10 @@ SET(X11_SOURCES
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(X11_HEADERS_MOC ${X11_QT_HEADERS})
|
QT5_WRAP_CPP(X11_HEADERS_MOC ${X11_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(X11_HEADERS_MOC ${X11_QT_HEADERS})
|
QT4_WRAP_CPP(X11_HEADERS_MOC ${X11_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(x11-grabber
|
add_library(x11-grabber
|
||||||
${X11_HEADERS}
|
${X11_HEADERS}
|
||||||
|
@ -90,10 +90,11 @@ bool X11Grabber::Setup()
|
|||||||
if (_x11Display == nullptr)
|
if (_x11Display == nullptr)
|
||||||
{
|
{
|
||||||
std::cerr << "X11GRABBER ERROR: Unable to open display";
|
std::cerr << "X11GRABBER ERROR: Unable to open display";
|
||||||
if (getenv("DISPLAY"))
|
if (getenv("DISPLAY")) {
|
||||||
std::cerr << " " << std::string(getenv("DISPLAY")) << std::endl;
|
std::cerr << " " << std::string(getenv("DISPLAY")) << std::endl;
|
||||||
else
|
} else {
|
||||||
std::cerr << ". DISPLAY environment variable not set" << std::endl;
|
std::cerr << ". DISPLAY environment variable not set" << std::endl;
|
||||||
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -171,23 +172,22 @@ int X11Grabber::updateScreenDimensions()
|
|||||||
|
|
||||||
std::cout << "X11GRABBER INFO: Update of screen resolution: [" << _screenWidth << "x" << _screenHeight <<"] => ";
|
std::cout << "X11GRABBER INFO: Update of screen resolution: [" << _screenWidth << "x" << _screenHeight <<"] => ";
|
||||||
|
|
||||||
if (_screenWidth || _screenHeight)
|
if (_screenWidth || _screenHeight) {
|
||||||
freeResources();
|
freeResources();
|
||||||
|
}
|
||||||
|
|
||||||
_screenWidth = _windowAttr.width;
|
_screenWidth = _windowAttr.width;
|
||||||
_screenHeight = _windowAttr.height;
|
_screenHeight = _windowAttr.height;
|
||||||
|
|
||||||
std::cout << "[" << _screenWidth << "x" << _screenHeight <<"]" << std::endl;
|
std::cout << "[" << _screenWidth << "x" << _screenHeight <<"]" << std::endl;
|
||||||
|
|
||||||
if (_screenWidth > unsigned(_cropLeft + _cropRight))
|
_croppedWidth = (_screenWidth > unsigned(_cropLeft + _cropRight))
|
||||||
_croppedWidth = _screenWidth - _cropLeft - _cropRight;
|
? (_screenWidth - _cropLeft - _cropRight)
|
||||||
else
|
: _screenWidth;
|
||||||
_croppedWidth = _screenWidth;
|
|
||||||
|
|
||||||
if (_screenHeight > unsigned(_cropTop + _cropBottom))
|
_croppedHeight = (_screenHeight > unsigned(_cropTop + _cropBottom))
|
||||||
_croppedHeight = _screenHeight - _cropTop - _cropBottom;
|
? (_screenHeight - _cropTop - _cropBottom)
|
||||||
else
|
: (_croppedHeight = _screenHeight);
|
||||||
_croppedHeight = _screenHeight;
|
|
||||||
|
|
||||||
std::cout << "X11GRABBER INFO: Using ";
|
std::cout << "X11GRABBER INFO: Using ";
|
||||||
|
|
||||||
|
@ -38,17 +38,17 @@ SET(Hyperion_SOURCES
|
|||||||
${CURRENT_SOURCE_DIR}/MessageForwarder.cpp
|
${CURRENT_SOURCE_DIR}/MessageForwarder.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(Hyperion_RESOURCES
|
SET(Hyperion_RESOURCES
|
||||||
${CURRENT_SOURCE_DIR}/resource.qrc
|
${CURRENT_SOURCE_DIR}/resource.qrc
|
||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(Hyperion_HEADERS_MOC ${Hyperion_QT_HEADERS})
|
QT5_WRAP_CPP(Hyperion_HEADERS_MOC ${Hyperion_QT_HEADERS})
|
||||||
QT5_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${Hyperion_RESOURCES} OPTIONS "-no-compress")
|
QT5_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${Hyperion_RESOURCES} OPTIONS "-no-compress")
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(Hyperion_HEADERS_MOC ${Hyperion_QT_HEADERS})
|
QT4_WRAP_CPP(Hyperion_HEADERS_MOC ${Hyperion_QT_HEADERS})
|
||||||
QT4_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${Hyperion_RESOURCES} OPTIONS "-no-compress")
|
QT4_ADD_RESOURCES(Hyperion_RESOURCES_RCC ${Hyperion_RESOURCES} OPTIONS "-no-compress")
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(hyperion
|
add_library(hyperion
|
||||||
${Hyperion_HEADERS}
|
${Hyperion_HEADERS}
|
||||||
@ -59,8 +59,8 @@ add_library(hyperion
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(hyperion Widgets)
|
qt5_use_modules(hyperion Widgets)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(hyperion
|
target_link_libraries(hyperion
|
||||||
blackborder
|
blackborder
|
||||||
|
@ -21,12 +21,12 @@ set(JsonServer_RESOURCES
|
|||||||
${CURRENT_SOURCE_DIR}/JsonSchemas.qrc
|
${CURRENT_SOURCE_DIR}/JsonSchemas.qrc
|
||||||
)
|
)
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
qt5_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||||
qt5_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
qt5_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
qt4_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
qt4_wrap_cpp(JsonServer_HEADERS_MOC ${JsonServer_QT_HEADERS})
|
||||||
qt4_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
qt4_add_resources(JsonServer_RESOURCES_RCC ${JsonServer_RESOURCES} OPTIONS "-no-compress")
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(jsonserver
|
add_library(jsonserver
|
||||||
${JsonServer_HEADERS}
|
${JsonServer_HEADERS}
|
||||||
@ -38,8 +38,8 @@ add_library(jsonserver
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(jsonserver Widgets Network)
|
qt5_use_modules(jsonserver Widgets Network)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(jsonserver
|
target_link_libraries(jsonserver
|
||||||
hyperion
|
hyperion
|
||||||
|
@ -9,7 +9,8 @@ find_package(Threads REQUIRED)
|
|||||||
|
|
||||||
include_directories(
|
include_directories(
|
||||||
../../include/hidapi
|
../../include/hidapi
|
||||||
${LIBUSB_1_INCLUDE_DIRS}) # for Lightpack device
|
${LIBUSB_1_INCLUDE_DIRS}
|
||||||
|
) # for Lightpack device
|
||||||
|
|
||||||
# Group the headers that go through the MOC compiler
|
# Group the headers that go through the MOC compiler
|
||||||
SET(Leddevice_QT_HEADERS
|
SET(Leddevice_QT_HEADERS
|
||||||
@ -88,30 +89,30 @@ if(ENABLE_SPIDEV)
|
|||||||
${CURRENT_SOURCE_DIR}/LedDeviceWs2812SPI.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceWs2812SPI.cpp
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceAPA102.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceAPA102.cpp
|
||||||
)
|
)
|
||||||
endif(ENABLE_SPIDEV)
|
endif()
|
||||||
|
|
||||||
if(ENABLE_WS2812BPWM)
|
if(ENABLE_WS2812BPWM)
|
||||||
SET(Leddevice_HEADERS
|
SET(Leddevice_HEADERS
|
||||||
${Leddevice_HEADERS}
|
${Leddevice_HEADERS}
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.h
|
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.h
|
||||||
)
|
)
|
||||||
SET(Leddevice_SOURCES
|
SET(Leddevice_SOURCES
|
||||||
${Leddevice_SOURCES}
|
${Leddevice_SOURCES}
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceWS2812b.cpp
|
||||||
)
|
)
|
||||||
endif(ENABLE_WS2812BPWM)
|
endif()
|
||||||
|
|
||||||
if(ENABLE_WS281XPWM)
|
if(ENABLE_WS281XPWM)
|
||||||
include_directories(../../dependencies/external/rpi_ws281x)
|
include_directories(../../dependencies/external/rpi_ws281x)
|
||||||
SET(Leddevice_HEADERS
|
SET(Leddevice_HEADERS
|
||||||
${Leddevice_HEADERS}
|
${Leddevice_HEADERS}
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.h
|
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.h
|
||||||
)
|
)
|
||||||
SET(Leddevice_SOURCES
|
SET(Leddevice_SOURCES
|
||||||
${Leddevice_SOURCES}
|
${Leddevice_SOURCES}
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceWS281x.cpp
|
||||||
)
|
)
|
||||||
endif(ENABLE_WS281XPWM)
|
endif()
|
||||||
|
|
||||||
if(ENABLE_TINKERFORGE)
|
if(ENABLE_TINKERFORGE)
|
||||||
SET(Leddevice_HEADERS
|
SET(Leddevice_HEADERS
|
||||||
@ -122,13 +123,13 @@ if(ENABLE_TINKERFORGE)
|
|||||||
${Leddevice_SOURCES}
|
${Leddevice_SOURCES}
|
||||||
${CURRENT_SOURCE_DIR}/LedDeviceTinkerforge.cpp
|
${CURRENT_SOURCE_DIR}/LedDeviceTinkerforge.cpp
|
||||||
)
|
)
|
||||||
endif(ENABLE_TINKERFORGE)
|
endif()
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
QT5_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
QT4_WRAP_CPP(Leddevice_HEADERS_MOC ${Leddevice_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
|
|
||||||
add_library(leddevice
|
add_library(leddevice
|
||||||
@ -139,8 +140,8 @@ add_library(leddevice
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(leddevice Widgets Network)
|
qt5_use_modules(leddevice Widgets Network)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(leddevice
|
target_link_libraries(leddevice
|
||||||
hyperion-utils
|
hyperion-utils
|
||||||
|
@ -15,10 +15,17 @@ AtmoOrbLight::AtmoOrbLight(unsigned int id) {
|
|||||||
// Not implemented
|
// Not implemented
|
||||||
}
|
}
|
||||||
|
|
||||||
LedDeviceAtmoOrb::LedDeviceAtmoOrb(const std::string &output, bool useOrbSmoothing,
|
LedDeviceAtmoOrb::LedDeviceAtmoOrb(
|
||||||
int transitiontime, int skipSmoothingDiff, int port, int numLeds, std::vector<unsigned int> orbIds) :
|
const std::string &output,
|
||||||
|
bool useOrbSmoothing,
|
||||||
|
int transitiontime,
|
||||||
|
int skipSmoothingDiff,
|
||||||
|
int port,
|
||||||
|
int numLeds,
|
||||||
|
std::vector<unsigned int> orbIds) :
|
||||||
multicastGroup(output.c_str()), useOrbSmoothing(useOrbSmoothing), transitiontime(transitiontime), skipSmoothingDiff(skipSmoothingDiff),
|
multicastGroup(output.c_str()), useOrbSmoothing(useOrbSmoothing), transitiontime(transitiontime), skipSmoothingDiff(skipSmoothingDiff),
|
||||||
multiCastGroupPort(port), numLeds(numLeds), orbIds(orbIds) {
|
multiCastGroupPort(port), numLeds(numLeds), orbIds(orbIds)
|
||||||
|
{
|
||||||
manager = new QNetworkAccessManager();
|
manager = new QNetworkAccessManager();
|
||||||
groupAddress = QHostAddress(multicastGroup);
|
groupAddress = QHostAddress(multicastGroup);
|
||||||
|
|
||||||
@ -29,7 +36,6 @@ LedDeviceAtmoOrb::LedDeviceAtmoOrb(const std::string &output, bool useOrbSmoothi
|
|||||||
}
|
}
|
||||||
|
|
||||||
int LedDeviceAtmoOrb::write(const std::vector <ColorRgb> &ledValues) {
|
int LedDeviceAtmoOrb::write(const std::vector <ColorRgb> &ledValues) {
|
||||||
|
|
||||||
// If not in multicast group return
|
// If not in multicast group return
|
||||||
if (!joinedMulticastgroup) {
|
if (!joinedMulticastgroup) {
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -25,7 +25,6 @@ LedDeviceUdp::LedDeviceUdp(const std::string& output, const unsigned baudrate, c
|
|||||||
//LedDeviceUdp::LedDeviceUdp(const std::string& output, const unsigned baudrate) :
|
//LedDeviceUdp::LedDeviceUdp(const std::string& output, const unsigned baudrate) :
|
||||||
// _ofs(output.empty()?"/home/pi/LedDevice.out":output.c_str())
|
// _ofs(output.empty()?"/home/pi/LedDevice.out":output.c_str())
|
||||||
{
|
{
|
||||||
|
|
||||||
std::string hostname;
|
std::string hostname;
|
||||||
std::string port;
|
std::string port;
|
||||||
ledprotocol = protocol;
|
ledprotocol = protocol;
|
||||||
@ -45,7 +44,7 @@ LedDeviceUdp::LedDeviceUdp(const std::string& output, const unsigned baudrate, c
|
|||||||
port+=output[i];
|
port+=output[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//std::cout << "output " << output << " hostname " << hostname << " port " << port <<std::endl;
|
//std::cout << "output " << output << " hostname " << hostname << " port " << port <<std::endl;
|
||||||
assert(got_colon==1);
|
assert(got_colon==1);
|
||||||
|
|
||||||
int rv;
|
int rv;
|
||||||
@ -153,7 +152,6 @@ int LedDeviceUdp::write(const std::vector<ColorRgb> & ledValues)
|
|||||||
udpbuffer[udpPtr++] = ledCtr%256; // low byte
|
udpbuffer[udpPtr++] = ledCtr%256; // low byte
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ledprotocol == 3) {
|
if (ledprotocol == 3) {
|
||||||
@ -172,7 +170,6 @@ int LedDeviceUdp::write(const std::vector<ColorRgb> & ledValues)
|
|||||||
udpbuffer[udpPtr++] = fragment_number++;
|
udpbuffer[udpPtr++] = fragment_number++;
|
||||||
udpbuffer[udpPtr++] = fragments;
|
udpbuffer[udpPtr++] = fragments;
|
||||||
|
|
||||||
|
|
||||||
for (const ColorRgb& color : ledValues)
|
for (const ColorRgb& color : ledValues)
|
||||||
{
|
{
|
||||||
if (udpPtr<4090) {
|
if (udpPtr<4090) {
|
||||||
|
@ -35,10 +35,10 @@ protobuf_generate_cpp(ProtoServer_PROTO_SRCS ProtoServer_PROTO_HDRS
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_wrap_cpp(ProtoServer_HEADERS_MOC ${ProtoServer_QT_HEADERS})
|
qt5_wrap_cpp(ProtoServer_HEADERS_MOC ${ProtoServer_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
qt4_wrap_cpp(ProtoServer_HEADERS_MOC ${ProtoServer_QT_HEADERS})
|
qt4_wrap_cpp(ProtoServer_HEADERS_MOC ${ProtoServer_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(protoserver
|
add_library(protoserver
|
||||||
${ProtoServer_HEADERS}
|
${ProtoServer_HEADERS}
|
||||||
@ -50,8 +50,8 @@ add_library(protoserver
|
|||||||
${ProtoServer_PROTO_HDRS}
|
${ProtoServer_PROTO_HDRS}
|
||||||
)
|
)
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(protoserver Widgets)
|
qt5_use_modules(protoserver Widgets)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(protoserver
|
target_link_libraries(protoserver
|
||||||
hyperion
|
hyperion
|
||||||
|
@ -16,10 +16,10 @@ SET(XBMCVideoChecker_SOURCES
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
QT5_WRAP_CPP(XBMCVideoChecker_HEADERS_MOC ${XBMCVideoChecker_QT_HEADERS})
|
QT5_WRAP_CPP(XBMCVideoChecker_HEADERS_MOC ${XBMCVideoChecker_QT_HEADERS})
|
||||||
else(ENABLE_QT5)
|
else()
|
||||||
QT4_WRAP_CPP(XBMCVideoChecker_HEADERS_MOC ${XBMCVideoChecker_QT_HEADERS})
|
QT4_WRAP_CPP(XBMCVideoChecker_HEADERS_MOC ${XBMCVideoChecker_QT_HEADERS})
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
add_library(xbmcvideochecker
|
add_library(xbmcvideochecker
|
||||||
${XBMCVideoChecker_HEADERS}
|
${XBMCVideoChecker_HEADERS}
|
||||||
@ -29,8 +29,8 @@ add_library(xbmcvideochecker
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(ENABLE_QT5)
|
if(ENABLE_QT5)
|
||||||
qt5_use_modules(xbmcvideochecker Widgets)
|
qt5_use_modules(xbmcvideochecker Widgets)
|
||||||
endif(ENABLE_QT5)
|
endif()
|
||||||
|
|
||||||
target_link_libraries(xbmcvideochecker
|
target_link_libraries(xbmcvideochecker
|
||||||
hyperion
|
hyperion
|
||||||
|
@ -2,30 +2,27 @@ add_subdirectory(hyperiond)
|
|||||||
add_subdirectory(hyperion-remote)
|
add_subdirectory(hyperion-remote)
|
||||||
|
|
||||||
# The following clients depend on the protobuf library
|
# The following clients depend on the protobuf library
|
||||||
if(ENABLE_PROTOBUF)
|
if (ENABLE_AMLOGIC)
|
||||||
|
|
||||||
if (ENABLE_AMLOGIC)
|
|
||||||
add_subdirectory(hyperion-aml)
|
add_subdirectory(hyperion-aml)
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_V4L2)
|
|
||||||
add_subdirectory(hyperion-v4l2)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_X11)
|
|
||||||
add_subdirectory(hyperion-x11)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_DISPMANX)
|
|
||||||
add_subdirectory(hyperion-dispmanx)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_FB)
|
|
||||||
add_subdirectory(hyperion-framebuffer)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(ENABLE_OSX)
|
|
||||||
add_subdirectory(hyperion-osx)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_V4L2)
|
||||||
|
add_subdirectory(hyperion-v4l2)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_X11)
|
||||||
|
add_subdirectory(hyperion-x11)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_DISPMANX)
|
||||||
|
add_subdirectory(hyperion-dispmanx)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_FB)
|
||||||
|
add_subdirectory(hyperion-framebuffer)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(ENABLE_OSX)
|
||||||
|
add_subdirectory(hyperion-osx)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
@ -51,10 +51,8 @@
|
|||||||
// JsonServer includes
|
// JsonServer includes
|
||||||
#include <jsonserver/JsonServer.h>
|
#include <jsonserver/JsonServer.h>
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
// ProtoServer includes
|
// ProtoServer includes
|
||||||
#include <protoserver/ProtoServer.h>
|
#include <protoserver/ProtoServer.h>
|
||||||
#endif
|
|
||||||
|
|
||||||
// BoblightServer includes
|
// BoblightServer includes
|
||||||
#include <boblightserver/BoblightServer.h>
|
#include <boblightserver/BoblightServer.h>
|
||||||
@ -208,7 +206,6 @@ int main(int argc, char** argv)
|
|||||||
std::cout << "INFO: Json server created and started on port " << jsonServer->getPort() << std::endl;
|
std::cout << "INFO: Json server created and started on port " << jsonServer->getPort() << std::endl;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
// Create Proto server if configuration is present
|
// Create Proto server if configuration is present
|
||||||
ProtoServer * protoServer = nullptr;
|
ProtoServer * protoServer = nullptr;
|
||||||
if (config.isMember("protoServer"))
|
if (config.isMember("protoServer"))
|
||||||
@ -217,7 +214,6 @@ int main(int argc, char** argv)
|
|||||||
protoServer = new ProtoServer(&hyperion, protoServerConfig["port"].asUInt() );
|
protoServer = new ProtoServer(&hyperion, protoServerConfig["port"].asUInt() );
|
||||||
std::cout << "INFO: Proto server created and started on port " << protoServer->getPort() << std::endl;
|
std::cout << "INFO: Proto server created and started on port " << protoServer->getPort() << std::endl;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
// Create Boblight server if configuration is present
|
// Create Boblight server if configuration is present
|
||||||
BoblightServer * boblightServer = nullptr;
|
BoblightServer * boblightServer = nullptr;
|
||||||
@ -254,9 +250,7 @@ int main(int argc, char** argv)
|
|||||||
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), dispmanx, SLOT(setVideoMode(VideoMode)));
|
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), dispmanx, SLOT(setVideoMode(VideoMode)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
QObject::connect(dispmanx, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
QObject::connect(dispmanx, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
||||||
#endif
|
|
||||||
|
|
||||||
dispmanx->start();
|
dispmanx->start();
|
||||||
std::cout << "INFO: Frame grabber created and started" << std::endl;
|
std::cout << "INFO: Frame grabber created and started" << std::endl;
|
||||||
@ -297,9 +291,7 @@ int main(int argc, char** argv)
|
|||||||
grabberConfig.get("cropTop", 0).asInt(),
|
grabberConfig.get("cropTop", 0).asInt(),
|
||||||
grabberConfig.get("cropBottom", 0).asInt());
|
grabberConfig.get("cropBottom", 0).asInt());
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
QObject::connect(v4l2Grabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
QObject::connect(v4l2Grabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
||||||
#endif
|
|
||||||
|
|
||||||
v4l2Grabber->start();
|
v4l2Grabber->start();
|
||||||
std::cout << "INFO: V4L2 grabber created and started" << std::endl;
|
std::cout << "INFO: V4L2 grabber created and started" << std::endl;
|
||||||
@ -331,9 +323,7 @@ int main(int argc, char** argv)
|
|||||||
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), amlGrabber, SLOT(setVideoMode(VideoMode)));
|
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), amlGrabber, SLOT(setVideoMode(VideoMode)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
QObject::connect(amlGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
QObject::connect(amlGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
||||||
#endif
|
|
||||||
|
|
||||||
amlGrabber->start();
|
amlGrabber->start();
|
||||||
std::cout << "INFO: AMLOGIC grabber created and started" << std::endl;
|
std::cout << "INFO: AMLOGIC grabber created and started" << std::endl;
|
||||||
@ -365,9 +355,7 @@ int main(int argc, char** argv)
|
|||||||
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), fbGrabber, SLOT(setVideoMode(VideoMode)));
|
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), fbGrabber, SLOT(setVideoMode(VideoMode)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
QObject::connect(fbGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
QObject::connect(fbGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
||||||
#endif
|
|
||||||
|
|
||||||
fbGrabber->start();
|
fbGrabber->start();
|
||||||
std::cout << "INFO: Framebuffer grabber created and started" << std::endl;
|
std::cout << "INFO: Framebuffer grabber created and started" << std::endl;
|
||||||
@ -405,9 +393,7 @@ int main(int argc, char** argv)
|
|||||||
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), osxGrabber, SLOT(setVideoMode(VideoMode)));
|
QObject::connect(xbmcVideoChecker, SIGNAL(videoMode(VideoMode)), osxGrabber, SLOT(setVideoMode(VideoMode)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
QObject::connect(osxGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
QObject::connect(osxGrabber, SIGNAL(emitImage(int, const Image<ColorRgb>&, const int)), protoServer, SLOT(sendImageToProtoSlaves(int, const Image<ColorRgb>&, const int)) );
|
||||||
#endif
|
|
||||||
|
|
||||||
osxGrabber->start();
|
osxGrabber->start();
|
||||||
std::cout << "INFO: OSX grabber created and started" << std::endl;
|
std::cout << "INFO: OSX grabber created and started" << std::endl;
|
||||||
@ -445,9 +431,7 @@ int main(int argc, char** argv)
|
|||||||
#endif
|
#endif
|
||||||
delete xbmcVideoChecker;
|
delete xbmcVideoChecker;
|
||||||
delete jsonServer;
|
delete jsonServer;
|
||||||
#ifdef ENABLE_PROTOBUF
|
|
||||||
delete protoServer;
|
delete protoServer;
|
||||||
#endif
|
|
||||||
delete boblightServer;
|
delete boblightServer;
|
||||||
|
|
||||||
// leave application
|
// leave application
|
||||||
|
Loading…
Reference in New Issue
Block a user