frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id

Browse Source 
Conflicts:
	src/hyperion-aml/CMakeLists.txt
	src/hyperion-remote/CMakeLists.txt
	src/hyperion-v4l2/CMakeLists.txt

Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb
This commit is contained in:
redpanther
2016-03-13 08:04:49 +01:00
parent e848411785 66cb9c3714
commit c7df8c23c6
74 changed files with 1572 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/hyperion-dispmanx/CMakeLists.txt
View File

@@ -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,13 +55,9 @@ 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)

2
src/hyperion-dispmanx/hyperion-dispmanx.cpp
View File

@@ -36,7 +36,7 @@ int main(int argc, char ** argv)
OptionsParser optionParser("Dispmanx capture application for Hyperion");
ParameterSet & parameters = optionParser.getParameters();
IntParameter & argFps = parameters.add<IntParameter> ('f', "framerate", "Capture frame rate [default=10]");
IntParameter & argFps = parameters.add<IntParameter> ('f', "framerate", "Capture frame rate [default: 10]");
IntParameter & argWidth = parameters.add<IntParameter> (0x0, "width", "The width of the grabbed frames [pixels]");
IntParameter & argHeight = parameters.add<IntParameter> (0x0, "height", "The height of the grabbed frames");