frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

restructured project structure: move projects into sub-folders, split dispmanx-grabber from hyperion

Browse Source
This commit is contained in:
johan 2013-08-17 16:12:42 +02:00
parent 16c260b3dc
commit 59e13a2b5f
18 changed files with 85 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
include/hyperion/DispmanxWrapper.h → include/dispmanx-grabber/DispmanxWrapper.h
View File

1
libsrc/CMakeLists.txt
View File

@ -4,5 +4,6 @@ SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc)
add_subdirectory(hyperion)
add_subdirectory(dispmanx-grabber)
add_subdirectory(jsonserver)
add_subdirectory(utils)

36
libsrc/dispmanx-grabber/CMakeLists.txt Normal file
View File

@ -0,0 +1,36 @@
# 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/dispmanx-grabber)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/dispmanx-grabber)
# Group the headers that go through the MOC compiler
SET(DispmanxGrabberQT_HEADERS
${CURRENT_HEADER_DIR}/DispmanxWrapper.h
)
SET(DispmanxGrabberHEADERS
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.h
)
SET(DispmanxGrabberSOURCES
${CURRENT_SOURCE_DIR}/DispmanxWrapper.cpp
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.cpp
)
QT4_WRAP_CPP(DispmanxGrabberHEADERS_MOC ${DispmanxGrabberQT_HEADERS})
add_library(dispmanx-grabber
${DispmanxGrabberHEADERS}
${DispmanxGrabberQT_HEADERS}
${DispmanxGrabberHEADERS_MOC}
${DispmanxGrabberSOURCES}
)
target_link_libraries(dispmanx-grabber
hyperion
${QT_LIBRARIES}
${BCM_LIBRARIES})

0
libsrc/hyperion/DispmanxFrameGrabber.cpp → libsrc/dispmanx-grabber/DispmanxFrameGrabber.cpp
View File

0
libsrc/hyperion/DispmanxFrameGrabber.h → libsrc/dispmanx-grabber/DispmanxFrameGrabber.h
View File

6
libsrc/hyperion/DispmanxWrapper.cpp → libsrc/dispmanx-grabber/DispmanxWrapper.cpp
View File

@ -3,15 +3,15 @@
#include <QDateTime>
// Hyperion includes
#include <hyperion/DispmanxWrapper.h>
#include <hyperion/Hyperion.h>
#include <hyperion/ImageProcessorFactory.h>
#include <hyperion/ImageProcessor.h>
// Local-Hyperion includes
// Local-dispmanx includes
#include <dispmanx-grabber/DispmanxWrapper.h>
#include "DispmanxFrameGrabber.h"
DispmanxWrapper::DispmanxWrapper(const unsigned grabWidth, const unsigned grabHeight, const unsigned updateRate_Hz, Hyperion * hyperion) :
_updateInterval_ms(1000/updateRate_Hz),
_timeout_ms(2 * _updateInterval_ms),

13
libsrc/hyperion/CMakeLists.txt
View File

@ -1,8 +1,4 @@
# 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/hyperion)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion)
@ -10,7 +6,6 @@ SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/hyperion)
# Group the headers that go through the MOC compiler
SET(Hyperion_QT_HEADERS
${CURRENT_HEADER_DIR}/Hyperion.h
${CURRENT_HEADER_DIR}/DispmanxWrapper.h
)
SET(Hyperion_HEADERS
@ -20,8 +15,6 @@ SET(Hyperion_HEADERS
${CURRENT_HEADER_DIR}/ImageProcessorFactory.h
${CURRENT_HEADER_DIR}/PriorityMuxer.h
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.h
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.h
${CURRENT_SOURCE_DIR}/LedDeviceTest.h
${CURRENT_SOURCE_DIR}/ImageToLedsMap.h
@ -35,9 +28,6 @@ SET(Hyperion_SOURCES
${CURRENT_SOURCE_DIR}/ImageProcessorFactory.cpp
${CURRENT_SOURCE_DIR}/PriorityMuxer.cpp
${CURRENT_SOURCE_DIR}/DispmanxWrapper.cpp
${CURRENT_SOURCE_DIR}/DispmanxFrameGrabber.cpp
${CURRENT_SOURCE_DIR}/LedDeviceWs2801.cpp
${CURRENT_SOURCE_DIR}/LedDeviceTest.cpp
${CURRENT_SOURCE_DIR}/ImageToLedsMap.cpp
@ -55,5 +45,4 @@ add_library(hyperion
target_link_libraries(hyperion
hyperion-utils
${QT_LIBRARIES}
${BCM_LIBRARIES})
${QT_LIBRARIES})

31
src/CMakeLists.txt
View File

@ -1,27 +1,4 @@
add_executable(WriteConfig
WriteConfig.cpp)
add_executable(hyperiond
hyperion-d.cpp)
target_link_libraries(hyperiond
hyperion
jsonserver)
# Find the libPNG
find_package(PNG QUIET)
if(PNG_FOUND)
# Add additional includes dirs
include_directories(${PNG_INCLUDE_DIR})
add_executable(ViewPng
ViewPng.cpp)
target_link_libraries(ViewPng
hyperion
${PNG_LIBRARIES})
endif(PNG_FOUND)
add_subdirectory(hyperion-remote)
add_subdirectory(hyperiond)
add_subdirectory(hyperion-remote)
add_subdirectory(viewpng)
add_subdirectory(writeconfig)

8
src/hyperiond/CMakeLists.txt Normal file
View File

@ -0,0 +1,8 @@
add_executable(hyperiond
hyperiond.cpp)
target_link_libraries(hyperiond
hyperion
dispmanx-grabber
jsonserver)

4
src/hyperion-d.cpp → src/hyperiond/hyperiond.cpp
View File

@ -6,9 +6,11 @@
#include <utils/jsonschema/JsonFactory.h>
// Hyperion includes
#include <hyperion/DispmanxWrapper.h>
#include <hyperion/Hyperion.h>
// Dispmanx grabber includes
#include <dispmanx-grabber/DispmanxWrapper.h>
// JsonServer includes
#include <jsonserver/JsonServer.h>

14
src/viewpng/CMakeLists.txt Normal file
View File

@ -0,0 +1,14 @@
# Find the libPNG
find_package(PNG QUIET)
if(PNG_FOUND)
# Add additional includes dirs
include_directories(${PNG_INCLUDE_DIR})
add_executable(viewpng
ViewPng.cpp)
target_link_libraries(viewpng
hyperion
${PNG_LIBRARIES})
endif(PNG_FOUND)

0
src/FbWriter.h → src/viewpng/FbWriter.h
View File

0
src/ViewPng.cpp → src/viewpng/ViewPng.cpp
View File

2
src/writeconfig/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
add_executable(WriteConfig
WriteConfig.cpp)

0
src/WriteConfig.cpp → src/writeconfig/WriteConfig.cpp
View File

20
test/CMakeLists.txt
View File

@ -2,30 +2,30 @@
include_directories(../libsrc)
# Add the simple test executable 'TestSpi'
add_executable(TestSpi
add_executable(test_spi
TestSpi.cpp)
target_link_libraries(TestSpi
target_link_libraries(test_spi
hyperion)
add_executable(TestConfigFile
add_executable(test_configfile
TestConfigFile.cpp)
target_link_libraries(TestConfigFile
target_link_libraries(test_configfile
hyperion)
add_executable(TestRgbImage
add_executable(test_rgbimage
TestRgbImage.cpp)
target_link_libraries(TestRgbImage
target_link_libraries(test_rgbimage
hyperion-utils)
add_executable(TestColorTransform
add_executable(test_colortransform
TestColorTransform.cpp)
target_link_libraries(TestColorTransform
target_link_libraries(test_colortransform
hyperion)
add_executable(TestImage2LedsMap
add_executable(test_image2ledsmap
TestImage2LedsMap.cpp)
target_link_libraries(TestImage2LedsMap
target_link_libraries(test_image2ledsmap
hyperion)
add_subdirectory(dispmanx2png)

2
test/dispmanx2png/CMakeLists.txt
View File

@ -14,5 +14,5 @@ add_executable(dispmanx2png
dispmanx2png.cpp)
target_link_libraries(dispmanx2png
hyperion
dispmanx-grabber
${QT_LIBRARIES})

4
test/dispmanx2png/dispmanx2png.cpp
View File

@ -6,8 +6,8 @@
#include <QImage>
#include <QTest>
// Hyperion includes
#include <hyperion/DispmanxFrameGrabber.h>
// Dispmanx grabber includes
#include <dispmanx-grabber/DispmanxFrameGrabber.h>
static bool running = true;