UI fixes/updates (#468)

* fix logging display

* hue wizard add usrname

* fix restartAction sometimes not executed

* remove configRevision

* remove v4l2 grabMode(2d/3d)

* remove latchTime from configs

not in main led device schema

* config comment: all grabbers can crop

* remove smoothing delay&pause for effects

* finalize disable effects ui

* fix empty effect selects

* remote page add 2D/3D videoMode

* add blackborder texts

* Update EffectEngine.cpp

assets/webconfig/content/remote.html

@@ -75,6 +75,14 @@
 				</div>
 			</div>
 		</div>
+		<div class="col-md-6 col-lg-6 col-xxl-5">
+			<div class="panel panel-default" >
+				<div class="panel-heading"><i class="fa fa-wifi fa-fw"></i><span data-i18n="remote_videoMode_label"></span></div>
+				<div class="panel-body" id="videomode_intro">
+					<div id="videomodebtns"></div>
+				</div>
+			</div>
+		</div>
 	</div>
 </div>
 <script src="/js/content_remote.js" ></script>

assets/webconfig/i18n/de.json

@@ -95,7 +95,7 @@
 	"conf_general_impexp_expbtn" : "Exportieren",
 	"conf_helptable_option" : "Option",
 	"conf_helptable_expl" : "Erklärung",
-	"conf_effect_path_intro" : "Definiere weitere Effekt-Pfade, wenn nötig.",
+	"conf_effect_path_intro" : "Hier kannst du Ordner angeben, die beim Laden von Effekten berücksichtig werden sollen. Zusätzlich können Effekte anhand ihres Namens deaktiviert werden um sie aus Listen zu löschen.",
 	"conf_effect_fgeff_intro" : "Definiere einen Start Effekt/Farbe, dieser wird angezeigt, wenn Hyperion startet für die angegebene Dauer.",
 	"conf_effect_bgeff_intro" : "Definiere einen Hintergrund Effekt/Farbe. Dieser wird aktiv, wenn Hyperion sich im Leerlauf befindet. Wird immer mit Priorität 255 gestartet.",
 	"conf_leds_device_intro" : "Wähle eine Methode zur Steuerung deiner LEDs aus, sie sind unterteilt in verschiedene Kategorien. Neben den allgemeinen Optionen die für alle gültig sind, gibt es auch spezfische die sich unterscheiden je nach Wahl.",
@@ -188,6 +188,11 @@
 	"remote_effects_label_effects" : "Effekt:",
 	"remote_adjustment_label" : "Farbanpassung",
 	"remote_adjustment_intro" : "Verändere live Farbe/Helligkeit/Kompensation. $1",
+	"remote_videoMode_label" : "Video Modus",
+	"remote_videoMode_intro" : "Wähle zwischen verschiedenen Video Modi um neben 2D auch 3D Filme zu genießen. Unterstützt werden alle Aufnahmearten. $1",
+	"remote_videoMode_3DSBS" : "3DSBS",
+	"remote_videoMode_3DTAB" : "3DTAB",
+	"remote_videoMode_2D" : "2D",
 	"remote_input_label" : "Quellenauswahl",
 	"remote_input_intro" : "Hyperion nutzt ein Prioritätensystem um die Quelle zu wählen. Alles was du setzt hat eine Priorität (Effekte/Farben/Plattform Aufnahme/USB Aufnahme und Netzwerkquellen). Standardmäßig nutzt Hyperion die Quelle mit der niedrigsten Priorität. Hier kannst du aktiv Einfluss darauf nehmen. $1",
 	"remote_input_label_autoselect" : "Automatische Auswahl",
@@ -283,7 +288,6 @@
 	"infoDialog_writeconf_error_text" : "Das speichern der Konfiguration ist fehlgeschlagen.",
 	"infoDialog_import_jsonerror_text" : "Die ausgewählte Konfigurations-Datei \"$1\" ist keine .json Datei oder ist beschädigt! Fehlermeldung: ($2)",
 	"infoDialog_import_hyperror_text" : "Die ausgewählte Konfigurations-Datei \"$1\" kann nicht importiert werden. Sie ist nicht kompatibel mit Hyperion 2.0 und höher!",
-	"infoDialog_import_reverror_text" : "Die Version deiner Konfigurations-Datei \"$1\" stimmt nicht mit deiner Hyperion Version überein (Datei: $2, Hyperion: $3). Du kannst nur übereinstimmende Versionen importieren!",
 	"infoDialog_import_comperror_text" : "Dein Browser unterstützt leider keinen Import. Bitte versuche es mit einem anderen Browser erneut.",
 	"infoDialog_import_confirm_title" : "Bestätige Import",
 	"infoDialog_import_confirm_text" : "Bist du sicher, dass du die Konfigurations-Datei \"$1\" importieren möchtest? Diese Aktion kann nicht rückgängig gemacht werden!",
@@ -490,8 +494,6 @@
 	"edt_conf_v4l2_frameDecimation_expl" : "Der Faktor der Bildverkleinerung",
 	"edt_conf_v4l2_sizeDecimation_title" : "Größenänderung",
 	"edt_conf_v4l2_sizeDecimation_expl" : "Der Faktor der Größenänderung",
-	"edt_conf_v4l2_mode_title" : "Modus",
-	"edt_conf_v4l2_mode_expl" : "Modus der USB Aufnahme",
 	"edt_conf_v4l2_useKodiChecker_title" : "Nutze Kodi Überwachung",
 	"edt_conf_v4l2_useKodiChecker_expl" : "Starte/Stoppe Aufnahme mithilfe der Kodi Überwachung.",
 	"edt_conf_v4l2_cropLeft_title" : "Entferne links",
@@ -539,10 +541,14 @@
 	"edt_conf_bb_heading_title" : "Schwarze Balken Erkennung",
 	"edt_conf_bb_threshold_title" : "Schwelle",
 	"edt_conf_bb_threshold_expl" : "Wenn die Erkennung nicht funktioniert, erhöhe die Schwelle um auf 'graues' schwarz zu reagieren.",
-	"edt_conf_bb_unknownFrameCnt_title" : "unknownFrameCnt",
+	"edt_conf_bb_unknownFrameCnt_title" : "Unbekannte Bilder",
-	"edt_conf_bb_borderFrameCnt_title" : "borderFrameCnt",
+	"edt_conf_bb_unknownFrameCnt_expl" : "Anzahl an Bildern die negativ sind, welche den Rand auf 0 zurücksetzen.",
-	"edt_conf_bb_maxInconsistentCnt_title" : "maxInconsistentCn",
+	"edt_conf_bb_borderFrameCnt_title" : "Randbilder",
-	"edt_conf_bb_blurRemoveCnt_title" : "blurRemoveCnt",
+	"edt_conf_bb_borderFrameCnt_expl" : "Anzahl an Bildern bis ein neuer Rand festgelegt wird.",
+	"edt_conf_bb_maxInconsistentCnt_title" : "Inkosistente Bilder",
+	"edt_conf_bb_maxInconsistentCnt_expl" : "Anzahl der zu ignorierenden Bilder bis ein neuer Rand überprüft wird.",
+	"edt_conf_bb_blurRemoveCnt_title" : "Unscharfe Pixel",
+	"edt_conf_bb_blurRemoveCnt_expl" : "Anzahl an Pixeln, die zusätzlich vom Rand abgeschnitten werden.",
 	"edt_conf_bb_mode_title" : "Modus",
 	"edt_conf_bb_mode_expl" : "Algorithmus zur Auswertung. (siehe Wiki)",
 	"edt_conf_kodic_heading_title" : "Kodi Überwachung",
@@ -599,15 +605,14 @@
 	"edt_conf_effp_paths_expl" : "Es können mehrere Ordner definiert werden die Effekte enthalten. Der Effekt Konfigurator speichert immer im Ersten Ordner.",
 	"edt_conf_effp_paths_itemtitle" : "Pfad",
 	"edt_conf_effp_disable_title" : "Deaktivierte Effekte",
+	"edt_conf_effp_disable_expl" : "Trage hier die Namen der Effekte ein, die in Effektlisten nicht mehr zur Auswahl stehen sollen.",
 	"edt_conf_effp_disable_itemtitle" : "Effekt",
 	"edt_conf_log_heading_title" : "Protokoll",
 	"edt_conf_log_level_title" : "Protokollstufe",
 	"edt_conf_log_level_expl" : "Abhängig der Stufe sind weniger oder mehr Meldungen sichtbar.",
-	"edt_eff_smooth_custom_title" : "Aktivere Glättung",
+	"edt_eff_smooth_custom" : "Aktivere Glättung",
-	"edt_eff_smooth_time_ms_title" : "Glättung: Zeit",
+	"edt_eff_smooth_time_ms" : "Glättung: Zeit",
-	"edt_eff_smooth_updateFrequency_title" : "Glättung: Aktualisierungsfrequenz",
+	"edt_eff_smooth_updateFrequency" : "Glättung: Aktualisierungsfrequenz",
-	"edt_eff_smooth_updateDelay_title" : "Glättung: Aktualisierungsverzögerung",
-	"edt_eff_smooth_pause_title" : "Glättung pausieren",
 	"edt_eff_candle_header" : "Kerze",
 	"edt_eff_candle_header_desc" : "Flackerndes Kerzenlicht",
 	"edt_eff_police_header" : "Polizei",

assets/webconfig/i18n/en.json

@@ -95,7 +95,7 @@
 	"conf_general_impexp_expbtn" : "Export",
 	"conf_helptable_option" : "Option",
 	"conf_helptable_expl" : "Explanation",
-	"conf_effect_path_intro" : "Define more effect paths if necessary.",
+	"conf_effect_path_intro" : "Load effects from the defined paths. Additional you can disable single effects by name to hide them from all effect lists.",
 	"conf_effect_fgeff_intro" : "Define a booteffect or color, which is shown during Hyperion startup for the defined duration.",
 	"conf_effect_bgeff_intro" : "Define a background effect/color, which is shown during Hyperion \"idle\". Sarts always with priority channel 255.",
 	"conf_leds_device_intro" : "Hyperion supports a lot of controllers to transmit data to your target device. Select a LED controller out of the sorted list and configure it. We have chosen the best default settings for each device.",
@@ -188,6 +188,11 @@
 	"remote_effects_label_effects" : "Effect:",
 	"remote_adjustment_label" : "Color adjustment",
 	"remote_adjustment_intro" : "Modifiy color/brightness/compensation during runtime. $1",
+	"remote_videoMode_label" : "Video mode",
+	"remote_videoMode_intro" : "Switch between different video modes to enjoy 3D movies! Supported are all capture devices. $1",
+	"remote_videoMode_3DSBS" : "3DSBS",
+	"remote_videoMode_3DTAB" : "3DTAB",
+	"remote_videoMode_2D" : "2D",
 	"remote_input_label" : "Source Selection",
 	"remote_input_intro" : "Hyperion uses a priority system to select a source. Everything you set has a priority (Effect/Color/Platform capture/USB capture and network sources). By default, Hyperion select sources depending on priority (lowest number reflects the current active source). Now you have the opportunity to select sources on your own. $1",
 	"remote_input_label_autoselect" : "Auto Selection",
@@ -283,7 +288,6 @@
 	"infoDialog_writeconf_error_text" : "Saving your configuration failed.",
 	"infoDialog_import_jsonerror_text" : "The selected configuration file \"$1\" is no .json file or it's corrupted. Error message: ($2)",
 	"infoDialog_import_hyperror_text" : "The selected configuration file \"$1\" can't be imported. It's not compatible with Hyperion 2.0 and higher!",
-	"infoDialog_import_reverror_text" : "The revision of your configuration file \"$1\" doesnt match the current Hyperion version you run (File: $2, Hyperion: $3). You could just import matching configurations!",
 	"infoDialog_import_comperror_text" : "Sad! Your browser doesn't support a import. Please try again with another browser.",
 	"infoDialog_import_confirm_title" : "Confirm import",
 	"infoDialog_import_confirm_text" : "Are you sure to import \"$1\"? This process can't be reverted!",
@@ -491,8 +495,6 @@
 	"edt_conf_v4l2_frameDecimation_expl" : "The factor of frame decimation",
 	"edt_conf_v4l2_sizeDecimation_title" : "Size decimation",
 	"edt_conf_v4l2_sizeDecimation_expl" : "The factor of size decimation",
-	"edt_conf_v4l2_mode_title" : "Mode",
-	"edt_conf_v4l2_mode_expl" : "Modus of USB capture",
 	"edt_conf_v4l2_useKodiChecker_title" : "Use Kodi Watch",
 	"edt_conf_v4l2_useKodiChecker_expl" : "Start/stop capturing with Kodi Watch results.",
 	"edt_conf_v4l2_cropLeft_title" : "Crop left",
@@ -540,10 +542,14 @@
 	"edt_conf_bb_heading_title" : "Blackbar detector",
 	"edt_conf_bb_threshold_title" : "Threshold",
 	"edt_conf_bb_threshold_expl" : "If the detection doesn't work, higher the threshold to adjust on 'greyish' black",
-	"edt_conf_bb_unknownFrameCnt_title" : "unknownFrameCnt",
+	"edt_conf_bb_unknownFrameCnt_title" : "Unknown frames",
-	"edt_conf_bb_borderFrameCnt_title" : "borderFrameCnt",
+	"edt_conf_bb_unknownFrameCnt_expl" : "Number of frames without any detection before the border is set to 0.",
-	"edt_conf_bb_maxInconsistentCnt_title" : "maxInconsistentCn",
+	"edt_conf_bb_borderFrameCnt_title" : "Border frames",
-	"edt_conf_bb_blurRemoveCnt_title" : "blurRemoveCnt",
+	"edt_conf_bb_borderFrameCnt_expl" : "Number of frames before a consistent detected border gets set.",
+	"edt_conf_bb_maxInconsistentCnt_title" : "Inconsistent frames",
+	"edt_conf_bb_maxInconsistentCnt_expl" : "Number of inconsistent frames that are ignored before a new border gets a chance to proof consistency.",
+	"edt_conf_bb_blurRemoveCnt_title" : "Blur pixel",
+	"edt_conf_bb_blurRemoveCnt_expl" : "Number of pixels that get removed from the detected border to cut away blur.",
 	"edt_conf_bb_mode_title" : "Mode",
 	"edt_conf_bb_mode_expl" : "Algorithm for processing. (see Wiki)",
 	"edt_conf_kodic_heading_title" : "Kodi Watch",
@@ -599,16 +605,15 @@
 	"edt_conf_effp_paths_title" : "Effect Path(s)",
 	"edt_conf_effp_paths_expl" : "You could define more folders that contain effects. The effect configurator will always save inside the first folder.",
 	"edt_conf_effp_paths_itemtitle" : "Path",
-	"edt_conf_effp_disable_title" : "Disabed Effects",
+	"edt_conf_effp_disable_title" : "Disabled Effects",
+	"edt_conf_effp_disable_expl" : "Add effect names here to disable/hide them from all effect lists.",
 	"edt_conf_effp_disable_itemtitle" : "Effect",
 	"edt_conf_log_heading_title" : "Logging",
 	"edt_conf_log_level_title" : "Log-Level",
 	"edt_conf_log_level_expl" : "Depending on loglevel you see less or more messages in your log.",
-	"edt_eff_smooth_custom_title" : "Enable smoothing",
+	"edt_eff_smooth_custom" : "Enable smoothing",
-	"edt_eff_smooth_time_ms_title" : "Smoothing time",
+	"edt_eff_smooth_time_ms" : "Smoothing time",
-	"edt_eff_smooth_updateFrequency_title" : "Smoothing update frequency",
+	"edt_eff_smooth_updateFrequency" : "Smoothing update frequency",
-	"edt_eff_smooth_updateDelay_title" : "Smoothing update delay",
-	"edt_eff_smooth_pause_title" : "Pause smoothing",
 	"edt_eff_candle_header" : "Candle",
 	"edt_eff_candle_header_desc" : "Shimmering candles",
 	"edt_eff_police_header" : "Police",

assets/webconfig/js/content_effects.js

@@ -1,7 +1,6 @@
 $(document).ready( function() {
 	performTranslation();
 	var oldEffects = [];
-	var editorReady = false;
 	var effects_editor = null;
 	var confFgEff = serverConfig.foregroundEffect.effect;
 	var confBgEff = serverConfig.backgroundEffect.effect;
@@ -62,7 +61,7 @@ $(document).ready( function() {
 
 
 	foregroundEffect_editor.on('ready',function() {
-		editorReady = true;
+		updateEffectlist();
 	});
 
 	foregroundEffect_editor.on('change',function() {
@@ -96,8 +95,6 @@ $(document).ready( function() {
 	}
 
 	function updateEffectlist(){
-		if(editorReady)
-		{
 		var newEffects = serverInfo.effects;
 		if (newEffects.length != oldEffects.length)
 		{
@@ -122,7 +119,6 @@ $(document).ready( function() {
 			$('#root_backgroundEffect_effect').val(confBgEff);
 		}
 	}
-	}
 
 	//interval update
 	$(hyperion).on("cmd-serverinfo",updateEffectlist);

assets/webconfig/js/content_general.js

@@ -59,14 +59,6 @@ $(document).ready( function() {
 						dis_imp_btn(true);
 					}
 					else
-					{
-						//check config revision
-						if(content.general.configVersion !== serverConfig.general.configVersion)
-						{
-							showInfoDialog('error', "", $.i18n('infoDialog_import_reverror_text', f.name, content.general.configVersion, serverConfig.general.configVersion));
-							dis_imp_btn(true);
-						}
-						else
 					{
 						dis_imp_btn(false);
 						importedConf = content;
@@ -74,7 +66,6 @@ $(document).ready( function() {
 					}
 				}
 			}
-			}
 			r.readAsText(f);
 		}
 	}
@@ -116,4 +107,3 @@ $(document).ready( function() {
 
 	removeOverlay();
 });
-

assets/webconfig/js/content_index.js

@@ -20,12 +20,6 @@ $(document).ready( function() {
 		else
 			$("#hyperion_disabled_notify").fadeOut("fast");
 
-		if ($("#logmessages").length == 0 && loggingStreamActive)
-		{
-			requestLoggingStop();
-			loggingStreamActive = false;
-		}
-
 		if (!serverInfo.hyperion.config_writeable)
 		{
 			showInfoDialog('uilock',$.i18n('InfoDialog_nowrite_title'),$.i18n('InfoDialog_nowrite_text'));

assets/webconfig/js/content_logging.js

@@ -144,6 +144,13 @@ $(document).ready(function() {
 	{
 		loggingHandlerInstalled = true;
 		$(hyperion).on("cmd-logging-update",function(event){
+			
+			if ($("#logmessages").length == 0 && loggingStreamActive)
+			{
+				requestLoggingStop();
+				loggingStreamActive = false;
+			}
+			
 			messages = (event.response.result.messages);
 			if(messages.length != 0 && !createdCont)
 			{

assets/webconfig/js/content_remote.js

@@ -21,6 +21,7 @@ $(document).ready(function() {
 		createHint("intro", $.i18n('remote_adjustment_intro', $.i18n('remote_losthint')), "adjust_content");
 		createHint("intro", $.i18n('remote_components_intro', $.i18n('remote_losthint')), "comp_intro");
 		createHint("intro", $.i18n('remote_maptype_intro', $.i18n('remote_losthint')), "maptype_intro");
+		createHint("intro", $.i18n('remote_videoMode_intro', $.i18n('remote_losthint')), "videomode_intro");
 	}
 
 	//color adjustment
@@ -95,6 +96,7 @@ $(document).ready(function() {
 		{
 			updateInputSelect();
 			updateLedMapping();
+			updateVideoMode();
 			updateComponents();
 			updateEffectlist();
 		}
@@ -261,6 +263,22 @@ $(document).ready(function() {
 		}
 	}
 
+	function updateVideoMode()
+	{
+		videoModes = ["2D","3DSBS","3DTAB"];
+		currVideoMode = serverInfo.grabbers.videomode;
+
+		$('#videomodebtns').html("");
+		for(var ix = 0; ix < videoModes.length; ix++)
+		{
+			if(currVideoMode == videoModes[ix])
+				btn_style = 'btn-success';
+			else
+				btn_style = 'btn-primary';
+			$('#videomodebtns').append('<button type="button" id="vModeBtn_'+videoModes[ix]+'" class="btn '+btn_style+'" style="margin:3px;min-width:200px" onclick="requestVideoMode(\''+videoModes[ix]+'\');">'+$.i18n('remote_videoMode_'+videoModes[ix])+'</button><br/>');
+		}
+	}
+
 	// colorpicker and effect
 	if (getStorage('rmcpcolor') != null)
 	{

assets/webconfig/js/hyperion.js

@@ -41,7 +41,8 @@ function connectionLostDetection(type)
 		if(type == 'restart')
 		{
 			$("body").html($("#container_restart").html());
-			restartAction();
+			// setTimeout delay for probably slower systems, some browser don't execute THIS action
+			setTimeout(restartAction,250);
 		}
 		else
 		{
@@ -305,6 +306,11 @@ function requestMappingType(type)
 	sendToHyperion("processing", "", '"mappingType": "'+type+'"');
 }
 
+function requestVideoMode(newMode)
+{
+	sendToHyperion("videomode", "", '"videoMode": "'+newMode+'"');
+}
+
 function requestAdjustment(type, value, complete)
 {
 	if(complete === true)

assets/webconfig/js/wizard.js

@@ -681,6 +681,12 @@
 
 	function beginWizardHue()
 	{
+		var usr = conf_editor.getEditor("root.specificOptions.username").getValue();
+		if(usr != "")
+		{
+			$('#user').val(usr);
+		}
+
 		//check if ip is empty/reachable/search for bridge
 		if(conf_editor.getEditor("root.specificOptions.output").getValue() == "")
 			getHueIPs();
@@ -690,9 +696,6 @@
 			$('#ip').val(ip);
 			hueIPs.push({internalipaddress : ip});
 			checkHueBridge(checkBridgeResult);
-			
-			var usr = conf_editor.getEditor("root.specificOptions.username").getValue();
-			$('#user').val(usr);
 		}
 
 		$('#retry_bridge').off().on('click', function(){

config/hyperion.config.json.commented

@@ -4,15 +4,13 @@
 
 
 {
-	/// geenral Settings 
+	/// general Settings
 	/// * 'name'          : The user friendly name of the hyperion instance (used for network things)
 	/// * 'showOptHelp'   : Show option expanations at the webui. Highly recommended for beginners.
-	/// * 'configVersion' : Don't touch! It's an internal value regarding which validation schema for this config is used.
 	"general" :
 	{
 		"name"       : "MyHyperionConfig",
-		"showOptHelp" : true,
+		"showOptHelp" : true
-		"configVersion" : 2
 	},
 	/// set log level: silent warn verbose debug
 	"logger" :
@@ -27,15 +25,13 @@
 	/// * [device type specific configuration]
 	/// * 'colorOrder' : The order of the color bytes ('rgb', 'rbg', 'bgr', etc.).
 	/// * 'rewriteTime': in ms. Data is resend to leds, if no new data is available in thistime. 0 means no refresh
-	/// * 'latchTime' : minimum time between led writes. 0 means no limit. default 10 means a rate of max 100Hz write time
 	"device" :
 	{
 		"type"       : "file",
 		"output"     : "/dev/null",
 		"rate"     : 1000000,
 		"colorOrder" : "rgb",
-		"rewriteTime": 0,
+		"rewriteTime": 0
-		"latchTime" : 10
 	},
 
 	/// Color manipulation configuration used to tune the output colors to specific surroundings.
@@ -112,7 +108,6 @@
 	///  * frameDecimation      : Frame decimation factor [default=2]
 	///  * sizeDecimation       : Size decimation factor [default=8]
 	///  * priority             : Hyperion priority channel [default=900]
-	///  * mode                 : 3D mode to use 2D/3DSBS/3DTAB (note: no autodetection) [default="2D"]
 	///  * useKodiChecker       : Enable/disable V4L2 according kodichecker sate if set to true [default=false]
 	///  * cropLeft             : Cropping from the left [default=0]
 	///  * cropRight            : Cropping from the right [default=0]
@@ -138,7 +133,6 @@
 			"frameDecimation" : 2,
 			"sizeDecimation"  : 8,
 			"priority"    : 240,
-			"mode"        : "2D",
 			"useKodiChecker" : false,
 			"cropLeft"    : 0,
 			"cropRight"   : 0,
@@ -170,6 +164,10 @@
 		"type"         : "framebuffer",
 		"frequency_Hz" : 10,
 		"priority"     : 250,
+		"cropLeft"     : 0,
+		"cropRight"    : 0,
+		"cropTop"      : 0,
+		"cropBottom"   : 0,
 
 		// valid for grabber: osx|dispmanx|amlogic|framebuffer
 		"width"        : 96,
@@ -180,12 +178,6 @@
 		"horizontalPixelDecimation" : 8,
 		"verticalPixelDecimation"   : 8,
 
-		// valid for dispmanx and x11
-		"cropLeft"   : 0,
-		"cropRight"  : 0,
-		"cropTop"    : 0,
-		"cropBottom" : 0,
-
 		// valid for framebuffer
 		"device"     : "/dev/fb0"
 	},

config/hyperion.config.json.default

@@ -2,8 +2,7 @@
 	"general" :
 	{
 		"name"       : "My Hyperion Config",
-		"showOptHelp" : true,
+		"showOptHelp" : true
-		"configVersion" : 2
 	},
 	"logger" :
 	{
@@ -16,8 +15,7 @@
 		"output"     : "/dev/null",
 		"rate"       : 1000000,
 		"colorOrder" : "rgb",
-		"rewriteTime": 5000,
+		"rewriteTime": 5000
-		"latchTime" : 10
 	},
 
 	"color" :
@@ -69,7 +67,6 @@
 			"frameDecimation" : 2,
 			"sizeDecimation"  : 8,
 			"priority"    : 240,
-			"mode"        : "2D",
 			"useKodiChecker" : false,
 			"cropLeft"    : 0,
 			"cropRight"   : 0,
@@ -189,7 +186,8 @@
 
 	"effects" :
 	{
-		"paths" : ["../custom-effects"]
+		"paths" : ["../custom-effects"],
+		"disable": [""]
 	},
 
 	"ledConfig" :

effects/candle.json

@@ -9,8 +9,6 @@
 		"candles" : "all",
 		"smoothing-custom-settings" : true,
 		"smoothing-time_ms" : 500,
-		"smoothing-updateDelay" : 0,
+		"smoothing-updateFrequency" : 20.0
-		"smoothing-updateFrequency" : 20.0,
-		"smoothing-pause" : false
 	}
 }

effects/mood-blobs-warm.json

@@ -11,6 +11,9 @@
 		"baseChange" : true,
 		"baseColorRangeLeft" : 333,
 		"baseColorRangeRight" : 151,
-		"baseColorChangeRate" : 2.0
+		"baseColorChangeRate" : 2.0,
+		"smoothing-custom-settings" : true,
+		"smoothing-time_ms" : 200,
+		"smoothing-updateFrequency" : 25.0
 	}
 }

effects/rainbow-swirl.json

@@ -10,6 +10,9 @@
 		"custom-colors":[],
 		"random-center":false,
 		"custom-colors2":[],
-		"enable-second":false
+		"enable-second":false,
+		"smoothing-custom-settings" : true,
+		"smoothing-time_ms" : 200,
+		"smoothing-updateFrequency" : 25.0
 	}
 }

effects/random.json

@@ -7,8 +7,6 @@
 		"saturation" : 1.0,
 		"smoothing-custom-settings" : true,
 		"smoothing-time_ms" : 200,
-		"smoothing-updateDelay" : 0,
+		"smoothing-updateFrequency" : 20.0
-		"smoothing-updateFrequency" : 20.0,
-		"smoothing-pause" : false
 	}
 }

effects/schema/candle.schema.json

@@ -71,14 +71,14 @@
 		"smoothing-custom-settings" :
 		{
 			"type" : "boolean",
-			"title" : "edt_eff_smooth_custom_title",
+			"title" : "edt_eff_smooth_custom",
 			"default" : false,
 			"propertyOrder" : 7
 		},
 		"smoothing-time_ms" :
 		{
 			"type" : "integer",
-			"title" : "edt_eff_smooth_time_ms_title",
+			"title" : "edt_eff_smooth_time_ms",
 			"minimum" : 25,
 			"maximum": 600,
 			"default" : 200,
@@ -93,7 +93,7 @@
 		"smoothing-updateFrequency" :
 		{
 			"type" : "number",
-			"title" : "edt_eff_smooth_updateFrequency_title",
+			"title" : "edt_eff_smooth_updateFrequency",
 			"minimum" : 1.0,
 			"maximum" : 100.0,
 			"default" : 25.0,
@@ -104,33 +104,6 @@
 				}
 			},
 			"propertyOrder" : 9
-		},
-		"smoothing-updateDelay" :
-		{
-			"type" : "integer",
-			"title" : "edt_eff_smooth_updateDelay_title",
-			"minimum" : 0,
-			"maximum": 2048,
-			"default" : 0,
-			"append" : "edt_append_ms",
-			"options": {
-				"dependencies": {
-					"smoothing-custom-settings": true
-				}
-			},
-			"propertyOrder" : 10
-		},
-		"smoothing-pause" :
-		{
-			"type" : "boolean",
-			"title" : "edt_eff_smooth_pause_title",
-			"default" : false,
-			"options": {
-				"dependencies": {
-					"smoothing-custom-settings": true
-				}
-			},
-			"propertyOrder" : 12
 		}
 	},
 	"additionalProperties": false

effects/schema/mood-blobs.schema.json

@@ -98,6 +98,43 @@
 				}
 			},
 			"propertyOrder" : 8
+		},
+		"smoothing-custom-settings" :
+		{
+			"type" : "boolean",
+			"title" : "edt_eff_smooth_custom",
+			"default" : false,
+			"propertyOrder" : 9
+		},
+		"smoothing-time_ms" :
+		{
+			"type" : "integer",
+			"title" : "edt_eff_smooth_time_ms",
+			"minimum" : 25,
+			"maximum": 600,
+			"default" : 200,
+			"append" : "edt_append_ms",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 10
+		},
+		"smoothing-updateFrequency" :
+		{
+			"type" : "number",
+			"title" : "edt_eff_smooth_updateFrequency",
+			"minimum" : 1.0,
+			"maximum" : 100.0,
+			"default" : 25.0,
+			"append" : "edt_append_hz",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 11
 		}
 	},
 	"additionalProperties": false

effects/schema/random.schema.json

@@ -24,14 +24,14 @@
 		"smoothing-custom-settings" :
 		{
 			"type" : "boolean",
-			"title" : "edt_eff_smooth_custom_title",
+			"title" : "edt_eff_smooth_custom",
 			"default" : false,
 			"propertyOrder" : 3
 		},
 		"smoothing-time_ms" :
 		{
 			"type" : "integer",
-			"title" : "edt_eff_smooth_time_ms_title",
+			"title" : "edt_eff_smooth_time_ms",
 			"minimum" : 25,
 			"maximum": 600,
 			"default" : 200,
@@ -46,7 +46,7 @@
 		"smoothing-updateFrequency" :
 		{
 			"type" : "number",
-			"title" : "edt_eff_smooth_updateFrequency_title",
+			"title" : "edt_eff_smooth_updateFrequency",
 			"minimum" : 1.0,
 			"maximum" : 100.0,
 			"default" : 25.0,
@@ -57,33 +57,6 @@
 				}
 			},
 			"propertyOrder" : 5
-		},
-		"smoothing-updateDelay" :
-		{
-			"type" : "integer",
-			"title" : "edt_eff_smooth_updateDelay_title",
-			"minimum" : 0,
-			"maximum": 2048,
-			"default" : 0,
-			"append" : "edt_append_ms",
-			"options": {
-				"dependencies": {
-					"smoothing-custom-settings": true
-				}
-			},
-			"propertyOrder" : 6
-		},
-		"smoothing-pause" :
-		{
-			"type" : "boolean",
-			"title" : "edt_eff_smooth_pause_title",
-			"default" : false,
-			"options": {
-				"dependencies": {
-					"smoothing-custom-settings": true
-				}
-			},
-			"propertyOrder" : 7
 		}
 	},
 	"additionalProperties": false

effects/schema/swirl.schema.json

@@ -145,6 +145,43 @@
 				}
 			},
 			"propertyOrder" : 12
+		},
+		"smoothing-custom-settings" :
+		{
+			"type" : "boolean",
+			"title" : "edt_eff_smooth_custom",
+			"default" : false,
+			"propertyOrder" : 13
+		},
+		"smoothing-time_ms" :
+		{
+			"type" : "integer",
+			"title" : "edt_eff_smooth_time_ms",
+			"minimum" : 25,
+			"maximum": 600,
+			"default" : 200,
+			"append" : "edt_append_ms",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 14
+		},
+		"smoothing-updateFrequency" :
+		{
+			"type" : "number",
+			"title" : "edt_eff_smooth_updateFrequency",
+			"minimum" : 1.0,
+			"maximum" : 100.0,
+			"default" : 25.0,
+			"append" : "edt_append_hz",
+			"options": {
+				"dependencies": {
+					"smoothing-custom-settings": true
+				}
+			},
+			"propertyOrder" : 15
 		}
 	},
 	"additionalProperties": false

libsrc/effectengine/EffectEngine.cpp

@@ -185,19 +185,15 @@ bool EffectEngine::loadEffectDefinition(const QString &path, const QString &effe
 	effectDefinition.args = config["args"].toObject();
 	effectDefinition.smoothCfg = SMOOTHING_MODE_PAUSE;
 	if (effectDefinition.args["smoothing-custom-settings"].toBool())
-	{
-		bool pause = effectDefinition.args["smoothing-pause"].toBool();
-		if (pause)
-		{
-			effectDefinition.smoothCfg = _hyperion->addSmoothingConfig(pause);
-		}
-		else
 	{
 		effectDefinition.smoothCfg = _hyperion->addSmoothingConfig(
 			effectDefinition.args["smoothing-time_ms"].toInt(),
 			effectDefinition.args["smoothing-updateFrequency"].toDouble(),
-				effectDefinition.args["smoothing-updateDelay"].toInt() );
+			0 );
 	}
+	else
+	{
+		effectDefinition.smoothCfg = _hyperion->addSmoothingConfig(true);
 	}
 	return true;
 }

libsrc/hyperion/schema/schema-effects.json

@@ -12,16 +12,19 @@
 				"type": "string",
 				"title" : "edt_conf_effp_paths_itemtitle"
 			},
+			"minItems" : 1,
 			"propertyOrder" : 1
 		},
 		"disable" :
 		{
 			"type" : "array",
 			"title" : "edt_conf_effp_disable_title",
+			"default" : [""],
 			"items" : {
 				"type": "string",
 				"title" : "edt_conf_effp_disable_itemtitle"
 			},
+			"required" : true,
 			"propertyOrder" : 2
 		}
 	},

libsrc/hyperion/schema/schema-general.json

@@ -21,14 +21,7 @@
 			"default" : true,
 			"required" : true,
 			"propertyOrder" : 2
+		}
 	},
-		"configVersion" :
+	"additionalProperties" : false
-		{
-			"type" : "integer",
-			"default" : 2,
-			"minimum" : 1,
-			"access" : "system",
-			"required" : true
-		}
-	}
 }

libsrc/hyperion/schema/schema-grabberV4L2.json

@@ -1,11 +1,13 @@
 {
 	"type":"array",
+	"required" : true,
 	"title" : "edt_conf_v4l2_heading_title",
 	"minItems": 1,
 	"maxItems": 2,
 	"items":
 	{
 		"type" : "object",
+		"required" : true,
 		"title" : "edt_conf_v4l2_heading_title",
 		"properties" :
 		{
@@ -14,6 +16,7 @@
 				"type" : "boolean",
 				"title" : "edt_conf_general_enable_title",
 				"default" : false,
+				"required" : true,
 				"propertyOrder" : 1
 			},
 			"device" :
@@ -21,6 +24,7 @@
 				"type" : "string",
 				"title" : "edt_conf_v4l2_device_title",
 				"default" : "auto",
+				"required" : true,
 				"propertyOrder" : 2
 			},
 			"input" :
@@ -29,6 +33,7 @@
 				"title" : "edt_conf_v4l2_input_title",
 				"minimum" : 0,
 				"default" : 0,
+				"required" : true,
 				"propertyOrder" : 3
 			},
 			"standard" :
@@ -40,6 +45,7 @@
 				"options" : {
 					"enum_titles" : ["edt_conf_enum_PAL", "edt_conf_enum_NTSC"]
 				},
+				"required" : true,
 				"propertyOrder" : 4
 			},
 			"width" :
@@ -49,6 +55,7 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
+				"required" : true,
 				"propertyOrder" : 5
 			},
 			"height" :
@@ -58,6 +65,7 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
+				"required" : true,
 				"propertyOrder" : 6
 			},
 			"frameDecimation" :
@@ -66,6 +74,7 @@
 				"title" : "edt_conf_v4l2_frameDecimation_title",
 				"minimum" : 0,
 				"default" : 2,
+				"required" : true,
 				"propertyOrder" : 7
 			},
 			"sizeDecimation" :
@@ -74,6 +83,7 @@
 				"title" : "Size decimation",
 				"minimum" : 0,
 				"default" : 6,
+				"required" : true,
 				"propertyOrder" : 8
 			},
 			"priority" :
@@ -83,22 +93,16 @@
 				"maximum" : 253,
 				"title" : "edt_conf_general_priority_title",
 				"default" : 240,
+				"required" : true,
 				"propertyOrder" : 9
 			},
-			"mode" :
-			{
-				"type" : "string",
-				"title" : "edt_conf_v4l2_mode_title",
-				"enum" : ["2D","3DSBS","3DTAB"],
-				"default" : "2D",
-				"propertyOrder" : 10
-			},
 			"useKodiChecker" :
 			{
 				"type" : "boolean",
 				"title" : "edt_conf_v4l2_useKodiChecker_title",
 				"default" : false,
-				"propertyOrder" : 11
+				"required" : true,
+				"propertyOrder" : 10
 			},
 			"cropLeft" :
 			{
@@ -107,7 +111,8 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
-				"propertyOrder" : 12
+				"required" : true,
+				"propertyOrder" : 11
 			},
 			"cropRight" :
 			{
@@ -116,7 +121,8 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
-				"propertyOrder" : 13
+				"required" : true,
+				"propertyOrder" : 12
 			},
 			"cropTop" :
 			{
@@ -125,7 +131,8 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
-				"propertyOrder" : 14
+				"required" : true,
+				"propertyOrder" : 13
 			},
 			"cropBottom" :
 			{
@@ -134,14 +141,16 @@
 				"minimum" : 0,
 				"default" : 0,
 				"append" : "edt_append_pixel",
-				"propertyOrder" : 15
+				"required" : true,
+				"propertyOrder" : 14
 			},
 			"signalDetection" :
 			{
 				"type" : "boolean",
 				"title" : "edt_conf_v4l2_signalDetection_title",
 				"default" : false,
-				"propertyOrder" : 16
+				"required" : true,
+				"propertyOrder" : 15
 			},
 			"redSignalThreshold" :
 			{
@@ -156,7 +165,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 17
+				"required" : true,
+				"propertyOrder" : 16
 			},
 			"greenSignalThreshold" :
 			{
@@ -171,7 +181,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 18
+				"required" : true,
+				"propertyOrder" : 17
 			},
 			"blueSignalThreshold" :
 			{
@@ -186,7 +197,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 19
+				"required" : true,
+				"propertyOrder" : 18
 			},
 			"sDVOffsetMin" :
 			{
@@ -201,7 +213,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 20
+				"required" : true,
+				"propertyOrder" : 19
 			},
 			"sDVOffsetMax" :
 			{
@@ -216,7 +229,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 21
+				"required" : true,
+				"propertyOrder" : 20
 			},
 			"sDHOffsetMin" :
 			{
@@ -231,7 +245,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 22
+				"required" : true,
+				"propertyOrder" : 21
 			},
 			"sDHOffsetMax" :
 			{
@@ -246,7 +261,8 @@
 						"signalDetection": true
 					}
 				},
-				"propertyOrder" : 23
+				"required" : true,
+				"propertyOrder" : 22
 			}
 		},
 	"additionalProperties" : false

libsrc/leddevice/schemas/schema-philipshue.json

@@ -10,7 +10,7 @@
 		"username": {
 			"type": "string",
 			"title":"edt_dev_spec_username_title",
-			"default": "newdeveloper",
+			"default": "",
 			"propertyOrder" : 2
 		},
 		"transitiontime": {

src/hyperiond/hyperiond.cpp

@@ -410,7 +410,6 @@ void HyperionDaemon::createSystemFrameGrabber()
 				QString type = grabberConfig["type"].toString("auto");
 			#endif
 			
-			
 			// auto eval of type
 			if ( type == "auto" )
 			{
@@ -583,7 +582,6 @@ void HyperionDaemon::createGrabberV4L2()
 				grabberConfig["blueSignalThreshold"].toDouble(0.0)/100.0,
 				grabberConfig["priority"].toInt(890),
 				grabberConfig["useKodiChecker"].toBool(false));
-			grabber->setVideoMode(parse3DMode(grabberConfig["mode"].toString("2D")));
 			grabber->setCropping(
 				grabberConfig["cropLeft"].toInt(0),
 				grabberConfig["cropRight"].toInt(0),