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

Split global capture from instance capture config

Browse Source
This commit is contained in:
Lord-Grey
2021-05-11 18:08:34 +02:00
parent ed87d0fd65
commit 980ef90834
13 changed files with 570 additions and 478 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libsrc/hyperion/schema/schema-framegrabber.json
View File

@@ -1,7 +1,15 @@
{
"type" : "object",
"title" : "edt_conf_fg_heading_title",
"properties": {
"properties":
{
"enable": {
"type": "boolean",
"title": "edt_conf_general_enable_title",
"required": true,
"default": false,
"propertyOrder": 1
},
"available_devices": {
"type": "string",
"title": "edt_conf_grabber_discovered_title",
@@ -9,7 +17,7 @@
"options": {
"infoText": "edt_conf_grabber_discovered_title_info"
},
"propertyOrder": 1,
"propertyOrder": 2,
"required": false
},
"device": {
@@ -19,13 +27,13 @@
"hidden": true
},
"required": true,
"comment": "The 'available_devices' settings are dynamically inserted into the WebUI under PropertyOrder '1'.",
"propertyOrder": 2
"comment": "The 'available_devices' settings are dynamically inserted into the WebUI under PropertyOrder '2'.",
"propertyOrder": 3
},
"device_inputs": {
"type": "string",
"title": "edt_conf_v4l2_input_title",
"propertyOrder": 3,
"propertyOrder": 4,
"required": false
},
"input": {
@@ -37,13 +45,13 @@
"hidden": true
},
"required": true,
"propertyOrder": 4,
"comment": "The 'device_inputs' settings are dynamically inserted into the WebUI under PropertyOrder '3'."
"propertyOrder": 5,
"comment": "The 'device_inputs' settings are dynamically inserted into the WebUI under PropertyOrder '4'."
},
"resolutions": {
"type": "string",
"title": "edt_conf_v4l2_resolution_title",
"propertyOrder": 5,
"propertyOrder": 6,
"required": false
},
"width": {
@@ -56,8 +64,8 @@
"hidden": true
},
"required": true,
"propertyOrder": 8,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '5'."
"propertyOrder": 9,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '6'."
},
"height": {
"type": "integer",
@@ -67,13 +75,13 @@
"hidden": true
},
"required": true,
"propertyOrder": 9,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '5'."
"propertyOrder": 10,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '6'."
},
"framerates": {
"type": "string",
"title": "edt_conf_fg_frequency_Hz_title",
"propertyOrder": 10,
"propertyOrder": 11,
"required": false
},
"fps": {
@@ -85,8 +93,8 @@
"hidden": true
},
"required": true,
"propertyOrder": 11,
"comment": "The 'framerates' setting is dynamically inserted into the WebUI under PropertyOrder '10'."
"propertyOrder": 12,
"comment": "The 'framerates' setting is dynamically inserted into the WebUI under PropertyOrder '11'."
},
"pixelDecimation": {
"type": "integer",
@@ -95,7 +103,7 @@
"maximum": 30,
"default": 8,
"required": true,
"propertyOrder": 12
"propertyOrder": 13
},
"cropLeft": {
"type": "integer",
@@ -103,7 +111,7 @@
"minimum": 0,
"default": 0,
"append": "edt_append_pixel",
"propertyOrder": 13
"propertyOrder": 14
},
"cropRight": {
"type": "integer",
@@ -111,7 +119,7 @@
"minimum": 0,
"default": 0,
"append": "edt_append_pixel",
"propertyOrder": 14
"propertyOrder": 15
},
"cropTop": {
"type": "integer",
@@ -119,7 +127,7 @@
"minimum": 0,
"default": 0,
"append": "edt_append_pixel",
"propertyOrder": 15
"propertyOrder": 16
},
"cropBottom": {
"type": "integer",
@@ -127,7 +135,7 @@
"minimum": 0,
"default": 0,
"append": "edt_append_pixel",
"propertyOrder": 16
"propertyOrder": 17
}
},
"additionalProperties" : false

84
libsrc/hyperion/schema/schema-grabberV4L2.json
View File

@@ -2,7 +2,15 @@
"type" : "object",
"required" : true,
"title" : "edt_conf_v4l2_heading_title",
"properties": {
"properties":
{
"enable": {
"type": "boolean",
"title": "edt_conf_general_enable_title",
"required": true,
"default": false,
"propertyOrder": 1
},
"available_devices": {
"type": "string",
"title": "edt_conf_grabber_discovered_title",
@@ -10,7 +18,7 @@
"options": {
"infoText": "edt_conf_grabber_discovered_title_info"
},
"propertyOrder": 1,
"propertyOrder": 2,
"required": false
},
"device": {
@@ -20,13 +28,13 @@
"hidden": true
},
"required": true,
"comment": "The 'available_devices' settings are dynamically inserted into the WebUI under PropertyOrder '1'.",
"propertyOrder": 2
"comment": "The 'available_devices' settings are dynamically inserted into the WebUI under PropertyOrder '2'.",
"propertyOrder": 3
},
"device_inputs": {
"type": "string",
"title": "edt_conf_v4l2_input_title",
"propertyOrder": 3,
"propertyOrder": 4,
"required": false
},
"input": {
@@ -37,15 +45,15 @@
"hidden": true
},
"required": true,
"propertyOrder": 4,
"comment": "The 'device_inputs' settings are dynamically inserted into the WebUI under PropertyOrder '3'."
"propertyOrder": 5,
"comment": "The 'device_inputs' settings are dynamically inserted into the WebUI under PropertyOrder '4'."
},
"standard": {
"type": "string",
"title": "edt_conf_v4l2_standard_title",
"required": false,
"propertyOrder": 5
"propertyOrder": 6
},
"encoding": {
"type": "string",
@@ -53,12 +61,12 @@
"default": "auto",
"required": true,
"access": "advanced",
"propertyOrder": 6
"propertyOrder": 7
},
"resolutions": {
"type": "string",
"title": "edt_conf_v4l2_resolution_title",
"propertyOrder": 7,
"propertyOrder": 8,
"required": false
},
"width": {
@@ -71,8 +79,8 @@
"hidden": true
},
"required": true,
"propertyOrder": 8,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '7'."
"propertyOrder": 9,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '8'."
},
"height": {
"type": "integer",
@@ -84,13 +92,13 @@
"hidden": true
},
"required": true,
"propertyOrder": 9,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '7'."
"propertyOrder": 10,
"comment": "The 'resolutions' settings are dynamically inserted into the WebUI under PropertyOrder '8'."
},
"framerates": {
"type": "string",
"title": "edt_conf_v4l2_framerate_title",
"propertyOrder": 10,
"propertyOrder": 11,
"required": false
},
"fps": {
@@ -103,8 +111,8 @@
"hidden": true
},
"required": true,
"propertyOrder": 11,
"comment": "The 'framerates' setting is dynamically inserted into the WebUI under PropertyOrder '10'."
"propertyOrder": 12,
"comment": "The 'framerates' setting is dynamically inserted into the WebUI under PropertyOrder '11'."
},
"fpsSoftwareDecimation": {
"type": "integer",
@@ -114,7 +122,7 @@
"default": 0,
"required": true,
"access": "expert",
"propertyOrder": 12
"propertyOrder": 13
},
"flip": {
"type": "string",
@@ -126,7 +134,7 @@
},
"required": true,
"access": "advanced",
"propertyOrder": 13
"propertyOrder": 14
},
"sizeDecimation": {
"type": "integer",
@@ -135,7 +143,7 @@
"maximum": 30,
"default": 8,
"required": true,
"propertyOrder": 14
"propertyOrder": 15
},
"hardware_brightness": {
"type": "integer",
@@ -143,7 +151,7 @@
"default": 0,
"required": true,
"access": "expert",
"propertyOrder": 15
"propertyOrder": 16
},
"hardware_contrast": {
"type": "integer",
@@ -151,7 +159,7 @@
"default": 0,
"required": true,
"access": "expert",
"propertyOrder": 16
"propertyOrder": 17
},
"hardware_saturation": {
"type": "integer",
@@ -159,7 +167,7 @@
"default": 0,
"required": true,
"access": "expert",
"propertyOrder": 17
"propertyOrder": 18
},
"hardware_hue": {
"type": "integer",
@@ -167,7 +175,7 @@
"default": 0,
"required": true,
"access": "expert",
"propertyOrder": 18
"propertyOrder": 19
},
"cropLeft": {
"type": "integer",
@@ -176,7 +184,7 @@
"default": 0,
"append": "edt_append_pixel",
"required": true,
"propertyOrder": 19
"propertyOrder": 20
},
"cropRight": {
"type": "integer",
@@ -185,7 +193,7 @@
"default": 0,
"append": "edt_append_pixel",
"required": true,
"propertyOrder": 20
"propertyOrder": 21
},
"cropTop": {
"type": "integer",
@@ -194,7 +202,7 @@
"default": 0,
"append": "edt_append_pixel",
"required": true,
"propertyOrder": 21
"propertyOrder": 22
},
"cropBottom": {
"type": "integer",
@@ -203,7 +211,7 @@
"default": 0,
"append": "edt_append_pixel",
"required": true,
"propertyOrder": 22
"propertyOrder": 23
},
"cecDetection": {
"type": "boolean",
@@ -211,7 +219,7 @@
"default": false,
"required": true,
"access": "advanced",
"propertyOrder": 23
"propertyOrder": 24
},
"signalDetection": {
"type": "boolean",
@@ -219,7 +227,7 @@
"default": false,
"required": true,
"access": "expert",
"propertyOrder": 24
"propertyOrder": 25
},
"redSignalThreshold": {
"type": "integer",
@@ -235,7 +243,7 @@
},
"access": "expert",
"required": true,
"propertyOrder": 25
"propertyOrder": 26
},
"greenSignalThreshold": {
"type": "integer",
@@ -251,7 +259,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 26
"propertyOrder": 27
},
"blueSignalThreshold": {
"type": "integer",
@@ -267,7 +275,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 27
"propertyOrder": 28
},
"noSignalCounterThreshold": {
"type": "integer",
@@ -282,7 +290,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 28
"propertyOrder": 29
},
"sDVOffsetMin": {
"type": "number",
@@ -298,7 +306,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 29
"propertyOrder": 30
},
"sDVOffsetMax": {
"type": "number",
@@ -314,7 +322,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 30
"propertyOrder": 31
},
"sDHOffsetMin": {
"type": "number",
@@ -330,7 +338,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 31
"propertyOrder": 32
},
"sDHOffsetMax": {
"type": "number",
@@ -346,7 +354,7 @@
},
"required": true,
"access": "expert",
"propertyOrder": 32
"propertyOrder": 33
}
},
"additionalProperties": true

77
libsrc/hyperion/schema/schema-instCapture.json
View File

@@ -2,43 +2,52 @@
"type" : "object",
"required" : true,
"title" : "edt_conf_instC_heading_title",
"properties" :
{
"systemEnable" :
{
"type" : "boolean",
"required" : true,
"title" : "edt_conf_instC_systemEnable_title",
"default" : true,
"propertyOrder" : 1
"properties": {
"systemEnable": {
"type": "boolean",
"required": true,
"title": "edt_conf_instC_systemEnable_title",
"default": true,
"propertyOrder": 1
},
"systemPriority" :
{
"type" : "integer",
"required" : true,
"title" : "edt_conf_general_priority_title",
"minimum" : 100,
"maximum" : 253,
"default" : 250,
"propertyOrder" : 2
"systemGrabberDevice": {
"type": "string",
"required": true,
"title": "edt_conf_instC_screen_grabber_device_title",
"default": "NONE",
"propertyOrder": 2
},
"v4lEnable" :
{
"type" : "boolean",
"required" : true,
"title" : "edt_conf_instC_v4lEnable_title",
"default" : false,
"propertyOrder" : 3
"systemPriority": {
"type": "integer",
"required": true,
"title": "edt_conf_general_priority_title",
"minimum": 100,
"maximum": 253,
"default": 250,
"propertyOrder": 3
},
"v4lPriority" :
{
"type" : "integer",
"required" : true,
"title" : "edt_conf_general_priority_title",
"minimum" : 100,
"maximum" : 253,
"default" : 240,
"propertyOrder" : 4
"v4lEnable": {
"type": "boolean",
"required": true,
"title": "edt_conf_instC_v4lEnable_title",
"default": false,
"propertyOrder": 4
},
"v4lGrabberDevice": {
"type": "string",
"required": true,
"title": "edt_conf_instC_video_grabber_device_title",
"default": "NONE",
"propertyOrder": 5
},
"v4lPriority": {
"type": "integer",
"required": true,
"title": "edt_conf_general_priority_title",
"minimum": 100,
"maximum": 253,
"default": 240,
"propertyOrder": 6
}
},
"additionalProperties" : false