From 74147d200f36ee910fc6d0d69a1631b6458e3b10 Mon Sep 17 00:00:00 2001
From: LordGrey <lordgrey.emmel@gmail.com>
Date: Mon, 15 Feb 2021 20:12:00 +0100
Subject: [PATCH] Update Grabber schema and Defaults

---
 config/hyperion.config.json.default            |  1 -
 libsrc/grabber/mediafoundation/MFWrapper.cpp   |  2 +-
 libsrc/grabber/v4l2/V4L2Wrapper.cpp            |  2 +-
 libsrc/hyperion/schema/schema-grabberV4L2.json | 11 +++++------
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/hyperion.config.json.default b/config/hyperion.config.json.default
index 7b83dded..040187eb 100644
--- a/config/hyperion.config.json.default
+++ b/config/hyperion.config.json.default
@@ -68,7 +68,6 @@
 		"width"                 : 0,
 		"height"                : 0,
 		"fps"                   : 15,
-		"standard"              : "NO_CHANGE",
 		"flip"                  : "NO_CHANGE",
 		"fpsSoftwareDecimation" : 0,
 		"sizeDecimation"        : 8,
diff --git a/libsrc/grabber/mediafoundation/MFWrapper.cpp b/libsrc/grabber/mediafoundation/MFWrapper.cpp
index 155f4740..c70aa0cd 100644
--- a/libsrc/grabber/mediafoundation/MFWrapper.cpp
+++ b/libsrc/grabber/mediafoundation/MFWrapper.cpp
@@ -127,7 +127,7 @@ void MFWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& c
 		_grabber.setPixelDecimation(obj["sizeDecimation"].toInt(8));
 
 		// flip mode
-		_grabber.setFlipMode(obj["flip"].toString("no-change"));
+		_grabber.setFlipMode(obj["flip"].toString("NO_CHANGE"));
 
 		// image cropping
 		_grabber.setCropping(
diff --git a/libsrc/grabber/v4l2/V4L2Wrapper.cpp b/libsrc/grabber/v4l2/V4L2Wrapper.cpp
index 8a463ba3..2782f17f 100644
--- a/libsrc/grabber/v4l2/V4L2Wrapper.cpp
+++ b/libsrc/grabber/v4l2/V4L2Wrapper.cpp
@@ -151,6 +151,6 @@ void V4L2Wrapper::handleSettingsUpdate(settings::type type, const QJsonDocument&
 			obj["blueSignalThreshold"].toDouble(0.0)/100.0);
 		_grabber.setDeviceVideoStandard(
 			obj["device"].toString("auto"),
-			parseVideoStandard(obj["standard"].toString("no-change")));
+			parseVideoStandard(obj["standard"].toString("NO_CHANGE")));
 	}
 }
diff --git a/libsrc/hyperion/schema/schema-grabberV4L2.json b/libsrc/hyperion/schema/schema-grabberV4L2.json
index 1325998a..ddb63e15 100644
--- a/libsrc/hyperion/schema/schema-grabberV4L2.json
+++ b/libsrc/hyperion/schema/schema-grabberV4L2.json
@@ -7,7 +7,7 @@
 			"type": "string",
 			"title": "edt_conf_v4l2_device_title",
 			"propertyOrder": 1,
-			"required": true
+			"required": false
 		},
 		"device": {
 			"type": "string",
@@ -23,7 +23,7 @@
 			"type": "string",
 			"title": "edt_conf_v4l2_input_title",
 			"propertyOrder": 3,
-			"required": true
+			"required": false
 		},
 		"input": {
 			"type": "integer",
@@ -40,8 +40,7 @@
 		"standard": {
 			"type": "string",
 			"title": "edt_conf_v4l2_standard_title",
-			"default": "auto",
-			"required": true,
+			"required": false,
 			"propertyOrder": 5
 		},
 		"encoding": {
@@ -55,7 +54,7 @@
 			"type": "string",
 			"title": "edt_conf_v4l2_resolution_title",
 			"propertyOrder": 7,
-			"required": true
+			"required": false
 		},
 		"width": {
 			"type": "integer",
@@ -87,7 +86,7 @@
 			"type": "string",
 			"title": "edt_conf_v4l2_framerate_title",
 			"propertyOrder": 10,
-			"required": true
+			"required": false
 		},
 		"fps": {
 			"type": "integer",