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

update to cmake 2.8.12 (#451)

Browse Source 
* update

* resolve qt5w

* test

* Go down

cmake python search won the price for crazy lib searches!

* 2.7 python forced, RPATH

* upstream

* ...

* update

* ...

* 2.7.12 py it picks random versions...

* max 7.12.5....

* Test 14.04 tests
This commit is contained in:
brindosch
2017-08-01 15:42:36 +02:00
committed by GitHub
parent 8752a313bc
commit 5c7085439b
57 changed files with 161 additions and 4153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libsrc/utils/CMakeLists.txt
View File

@@ -3,12 +3,6 @@
SET(CURRENT_HEADER_DIR ${CMAKE_SOURCE_DIR}/include/utils)
SET(CURRENT_SOURCE_DIR ${CMAKE_SOURCE_DIR}/libsrc/utils)
SET(Utils_QT_HEADERS
${CURRENT_HEADER_DIR}/Logger.h
${CURRENT_HEADER_DIR}/Stats.h
${CURRENT_HEADER_DIR}/JsonProcessor.h
)
SET(Utils_HEADERS
${CURRENT_HEADER_DIR}/ColorBgr.h
${CURRENT_HEADER_DIR}/ColorRgb.h
@@ -30,6 +24,9 @@ SET(Utils_HEADERS
${CURRENT_HEADER_DIR}/jsonschema/QJsonUtils.h
${CURRENT_HEADER_DIR}/global_defines.h
${CURRENT_HEADER_DIR}/SysInfo.h
${CURRENT_HEADER_DIR}/Logger.h
${CURRENT_HEADER_DIR}/Stats.h
${CURRENT_HEADER_DIR}/JsonProcessor.h
)
SET(Utils_SOURCES
@@ -56,18 +53,24 @@ if ( ENABLE_PROFILER )
SET ( PROFILER_SOURCE ${CURRENT_HEADER_DIR}/Profiler.h ${CURRENT_SOURCE_DIR}/Profiler.cpp )
endif()
qt5_wrap_cpp(Utils_HEADERS_MOC ${Utils_QT_HEADERS})
set(Utils_RESOURCES
${CURRENT_SOURCE_DIR}/JSONRPC_schemas.qrc
)
qt5_add_resources(Utils_RESOURCES_RCC ${Utils_RESOURCES} OPTIONS "-no-compress")
add_library(hyperion-utils
${Utils_QT_HEADERS}
${Utils_HEADERS_MOC}
${Utils_HEADERS}
${Utils_SOURCES}
${PROFILER_SOURCE}
${Utils_RESOURCES}
${Utils_RESOURCES_RCC}
)
qt5_use_modules(hyperion-utils Core Gui Network)
target_link_libraries(hyperion-utils
${QT_LIBRARIES})
hyperion
Qt5::Core
Qt5::Gui
Qt5::Network
)

154
libsrc/utils/JSONRPC_schema/schema-adjustment.json Normal file
View File

@@ -0,0 +1,154 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["adjustment"]
},
"tan" : {
"type" : "integer"
},
"adjustment": {
"type": "object",
"required": true,
"properties": {
"id" : {
"type" : "string",
"required" : false
},
"red": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"green": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"blue": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"yellow": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"magenta": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"cyan": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"black": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"white": {
"type": "array",
"required": false,
"items" : {
"type": "integer",
"minimum": 0,
"maximum": 255
},
"minItems": 3,
"maxItems": 3
},
"gammaRed": {
"type" : "number",
"required" : false,
"minimum" : 0.1,
"maximum" : 5.0
},
"gammaGreen": {
"type" : "number",
"required" : false,
"minimum" : 0.1,
"maximum" : 5.0
},
"gammaBlue": {
"type" : "number",
"required" : false,
"minimum" : 0.1,
"maximum" : 5.0
},
"backlightThreshold" : {
"type" : "integer",
"required" : false,
"minimum" : 0,
"maximum" : 100
},
"backlightColored" : {
"type" : "boolean",
"required" : false
},
"brightness" : {
"type" : "integer",
"required" : false,
"minimum" : 0,
"maximum" : 100
},
"brightnessCompensation" : {
"type" : "integer",
"required" : false,
"minimum" : 0,
"maximum" : 100
}
},
"additionalProperties": false
}
},
"additionalProperties": false
}

21
libsrc/utils/JSONRPC_schema/schema-clear.json Normal file
View File

@@ -0,0 +1,21 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["clear"]
},
"tan" : {
"type" : "integer"
},
"priority": {
"type": "integer",
"minimum" : 1,
"maximum" : 253,
"required": true
}
},
"additionalProperties": false
}

15
libsrc/utils/JSONRPC_schema/schema-clearall.json Normal file
View File

@@ -0,0 +1,15 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["clearall"]
},
"tan" : {
"type" : "integer"
}
},
"additionalProperties": false
}

39
libsrc/utils/JSONRPC_schema/schema-color.json Normal file
View File

@@ -0,0 +1,39 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["color"]
},
"tan" : {
"type" : "integer"
},
"priority": {
"type": "integer",
"minimum" : 1,
"maximum" : 253,
"required": true
},
"duration": {
"type": "integer",
"required": false
},
"origin": {
"type": "string",
"minLength" : 4,
"maxLength" : 20,
"required": true
},
"color": {
"type": "array",
"required": true,
"items" :{
"type" : "integer"
},
"minItems": 3
}
},
"additionalProperties": false
}

37
libsrc/utils/JSONRPC_schema/schema-componentstate.json Normal file
View File

@@ -0,0 +1,37 @@
{
"type":"object",
"required":true,
"properties":
{
"command":
{
"type" : "string",
"required" : true,
"enum" : ["componentstate"]
},
"tan" : {
"type" : "integer"
},
"componentstate":
{
"type": "object",
"required": true,
"properties":
{
"component":
{
"type" : "string",
"enum" : ["ALL", "SMOOTHING", "BLACKBORDER", "KODICHECKER", "FORWARDER", "UDPLISTENER", "BOBLIGHTSERVER", "GRABBER", "V4L", "LEDDEVICE"],
"required": true
},
"state":
{
"type": "bool",
"required": true
}
},
"additionalProperties": false
}
},
"additionalProperties": false
}

23
libsrc/utils/JSONRPC_schema/schema-config.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["config"]
},
"subcommand": {
"type" : "string",
"required" : true,
"enum" : ["getconfig","getschema","reload"]
},
"tan" : {
"type" : "integer"
},
"config": {
"type" : "object"
}
},
"additionalProperties": false
}

30
libsrc/utils/JSONRPC_schema/schema-create-effect.json Normal file
View File

@@ -0,0 +1,30 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["create-effect"]
},
"tan" : {
"type" : "integer"
},
"name" :
{
"type" : "string",
"required" : true
},
"script" :
{
"type" : "string",
"required" : true
},
"args" :
{
"type" : "object",
"required" : true
}
},
"additionalProperties": false
}

21
libsrc/utils/JSONRPC_schema/schema-delete-effect.json Normal file
View File

@@ -0,0 +1,21 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["delete-effect"]
},
"tan" : {
"type" : "integer"
},
"name" :
{
"type" : "string",
"required" : true
}
},
"additionalProperties": false
}

50
libsrc/utils/JSONRPC_schema/schema-effect.json Normal file
View File

@@ -0,0 +1,50 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["effect"]
},
"tan" : {
"type" : "integer"
},
"priority": {
"type": "integer",
"minimum" : 1,
"maximum" : 253,
"required": true
},
"duration": {
"type": "integer",
"required": false
},
"origin": {
"type": "string",
"minLength" : 4,
"maxLength" : 20,
"required": true
},
"effect": {
"type": "object",
"required": true,
"properties" :{
"name" : {
"type" : "string",
"required" : true
},
"args" : {
"type" : "object",
"required" : false
}
},
"additionalProperties": false
},
"pythonScript" : {
"type" : "string",
"required" : false
}
},
"additionalProperties": false
}

43
libsrc/utils/JSONRPC_schema/schema-image.json Normal file
View File

@@ -0,0 +1,43 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["image"]
},
"tan" : {
"type" : "integer"
},
"priority": {
"type": "integer",
"minimum" : 1,
"maximum" : 253,
"required": true
},
"origin": {
"type": "string",
"required": true
},
"duration": {
"type": "integer",
"required": false
},
"imagewidth": {
"type" : "integer",
"required": true,
"minimum": 0
},
"imageheight": {
"type" : "integer",
"required": true,
"minimum": 0
},
"imagedata": {
"type": "string",
"required": true
}
},
"additionalProperties": false
}

27
libsrc/utils/JSONRPC_schema/schema-ledcolors.json Normal file
View File

@@ -0,0 +1,27 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["ledcolors"]
},
"tan" : {
"type" : "integer"
},
"subcommand": {
"type" : "string",
"required" : true,
"enum" : ["ledstream-stop","ledstream-start","testled","imagestream-start","imagestream-stop"]
},
"oneshot": {
"type" : "bool"
},
"interval": {
"type" : "integer"
}
},
"additionalProperties": false
}

28
libsrc/utils/JSONRPC_schema/schema-logging.json Normal file
View File

@@ -0,0 +1,28 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["logging"]
},
"tan" : {
"type" : "integer"
},
"subcommand": {
"type" : "string",
"required" : true,
"enum" : ["stop","start","update"]
},
"oneshot": {
"type" : "bool"
},
"interval": {
"type" : "integer"
}
},
"additionalProperties": false
}

19
libsrc/utils/JSONRPC_schema/schema-processing.json Normal file
View File

@@ -0,0 +1,19 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["processing"]
},
"tan" : {
"type" : "integer"
},
"mappingType": {
"type" : "string",
"enum" : ["multicolor_mean", "unicolor_mean"]
}
},
"additionalProperties": false
}

15
libsrc/utils/JSONRPC_schema/schema-serverinfo.json Normal file
View File

@@ -0,0 +1,15 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["serverinfo"]
},
"tan" : {
"type" : "integer"
}
},
"additionalProperties": false
}

23
libsrc/utils/JSONRPC_schema/schema-sourceselect.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type":"object",
"required":false,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["sourceselect"]
},
"tan" : {
"type" : "integer"
},
"priority": {
"type": "integer",
"minimum" : 0,
"maximum" : 255
},
"auto": {
"type": "boolean"
}
},
"additionalProperties": false
}

15
libsrc/utils/JSONRPC_schema/schema-sysinfo.json Normal file
View File

@@ -0,0 +1,15 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["sysinfo"]
},
"tan" : {
"type" : "integer"
}
},
"additionalProperties": false
}

11
libsrc/utils/JSONRPC_schema/schema.json Normal file
View File

@@ -0,0 +1,11 @@
{
"type":"object",
"required":true,
"properties":{
"command": {
"type" : "string",
"required" : true,
"enum" : ["color", "image", "effect", "create-effect", "delete-effect", "serverinfo", "clear", "clearall", "adjustment", "sourceselect", "config", "componentstate", "ledcolors", "logging", "processing", "sysinfo"]
}
}
}

21
libsrc/utils/JSONRPC_schemas.qrc Normal file
View File

@@ -0,0 +1,21 @@
<RCC>
<qresource prefix="/">
<file alias="schema">JSONRPC_schema/schema.json</file>
<file alias="schema-color">JSONRPC_schema/schema-color.json</file>
<file alias="schema-image">JSONRPC_schema/schema-image.json</file>
<file alias="schema-serverinfo">JSONRPC_schema/schema-serverinfo.json</file>
<file alias="schema-sysinfo">JSONRPC_schema/schema-sysinfo.json</file>
<file alias="schema-clear">JSONRPC_schema/schema-clear.json</file>
<file alias="schema-clearall">JSONRPC_schema/schema-clearall.json</file>
<file alias="schema-adjustment">JSONRPC_schema/schema-adjustment.json</file>
<file alias="schema-effect">JSONRPC_schema/schema-effect.json</file>
<file alias="schema-create-effect">JSONRPC_schema/schema-create-effect.json</file>
<file alias="schema-delete-effect">JSONRPC_schema/schema-delete-effect.json</file>
<file alias="schema-sourceselect">JSONRPC_schema/schema-sourceselect.json</file>
<file alias="schema-config">JSONRPC_schema/schema-config.json</file>
<file alias="schema-componentstate">JSONRPC_schema/schema-componentstate.json</file>
<file alias="schema-ledcolors">JSONRPC_schema/schema-ledcolors.json</file>
<file alias="schema-logging">JSONRPC_schema/schema-logging.json</file>
<file alias="schema-processing">JSONRPC_schema/schema-processing.json</file>
</qresource>
</RCC>

2
libsrc/utils/JsonProcessor.cpp
View File

@@ -1077,7 +1077,7 @@ void JsonProcessor::sendErrorReply(const QString &error, const QString &command,
bool JsonProcessor::checkJson(const QJsonObject& message, const QString& schemaResource, QString& errorMessage, bool ignoreRequired)
{
// make sure the resources are loaded (they may be left out after static linking)
Q_INIT_RESOURCE(JsonSchemas);
Q_INIT_RESOURCE(JSONRPC_schemas);
QJsonParseError error;
// read the json schema from the resource