WebUI optimization (thx to @mkcologne)

Start Grabber only when global settings are enabled
Fixed an issue in the WebUI preview

assets/webconfig/css/hyperion.css

@@ -24,14 +24,35 @@ body{
 */
 /* fixed brand icon */
 @media (min-width: 768px){
-    .navbar-brand{position:fixed}
+  #wrapper{
-  #main-nav{position:absolute !important;}
+    padding-left: 10px;
+    padding-bottom: 10px;
+    padding-right: 10px;
+  }
+  .navbar-brand{
+    position:fixed;
+    padding: 0px;
+    height: 80px;
+  }
+  #main-nav{
+    position:absolute !important;
+  }
+  .navbar-top-links li a {
+    font-size: 22px;
+  }
 }
 
 /*mobile nav*/
 @media (max-width: 768px){
-    .navbar-toggle{position:fixed;right:0px;}
+    #wrapper{
-    #main-nav{position:fixed;right:-200px;}
+      padding: 0px;
+    }
+    .navbar-toggle{
+      position:fixed;right:0px;
+    }
+    #main-nav{
+      position:fixed;right:-200px;
+    }
 }
 .navbar-toggle .icon-bar {
   background-color:#4c4c4c !important;
@@ -83,14 +104,14 @@ table.first_cell_borderless td:first-child,table.first_cell_borderless th:first-
 table.first_cell_borderless td:first-child{width: 25px !important;}
 
 /*Header*/
-.navbar-brand{padding-top:4px;padding-bottom:0px;padding-left:2;}
+.navbar-brand{padding-top:0px;padding-left:2;}
-.sidebar{margin-top:65px;}
+.sidebar{margin-top:85px;}
 .dropdown{font-size:18px;}
 @media (max-width: 767px) {.sidebar{margin-top:0px;padding-top:0px !important;}}
 .page-header{margin-top:0px;}
 
 .navbar-top-links li a {
-    min-height: 64px;
+    min-height: 84px;
     display: flex;
     align-items: center;
 }

assets/webconfig/index.html

@@ -101,7 +101,7 @@
   <div id="wrapper">
 
     <!-- Navigation -->
-    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; min-height: 65px">
+    <nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0; min-height: 85px">
       <div class="navbar-header">
         <button type="button" class="navbar-toggle closed" aria-controls="navbar">
           <span class="sr-only">Toggle navigation</span>
@@ -109,7 +109,7 @@
           <span class="icon-bar middle-bar"></span>
           <span class="icon-bar bottom-bar"></span>
         </button>
-        <a class="navbar-brand" href="https://www.hyperion-project.org" target="_blank"><img id="navbar_brand_logo" src="img/hyperion/logo_positiv.png" alt="Redefine ambient light!" height="60"></a>
+        <a class="navbar-brand" href="https://www.hyperion-project.org" target="_blank"><img id="navbar_brand_logo" src="img/hyperion/logo_positiv.png" alt="Redefine ambient light!" height="80"></a>
 
       </div>
       <!-- /.navbar-header -->

assets/webconfig/js/ledsim.js

@@ -112,6 +112,7 @@ $(document).ready(function () {
       },
       closed: function (e) {
         modalOpened = false;
+        lC = false;
       },
       resizeStop: function (e) {
         setStorage("ledsim_width", $("#ledsim_dialog").outerWidth());

include/hyperion/GrabberWrapper.h

@@ -23,6 +23,8 @@ class QTimer;
 /// Map of Hyperion instances with grabber name that requested screen capture
 static QMap<int, QString> GRABBER_SYS_CLIENTS;
 static QMap<int, QString> GRABBER_V4L_CLIENTS;
+static bool GLOBAL_GRABBER_SYS_ENABLE;
+static bool GLOBAL_GRABBER_V4L_ENABLE;
 
 ///
 /// This class will be inherted by FramebufferWrapper and others which contains the real capture interface

libsrc/grabber/video/VideoWrapper.cpp

@@ -53,6 +53,11 @@ void VideoWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument
 		// extract settings
 		const QJsonObject& obj = config.object();
 
+		// global grabber state
+		GLOBAL_GRABBER_V4L_ENABLE = obj["enable"].toBool(false);
+
+		if (GLOBAL_GRABBER_V4L_ENABLE)
+		{
 			// Device
 			_grabber.setDevice(obj["device"].toString("auto"));
 
@@ -116,6 +121,7 @@ void VideoWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument
 			_grabber.reload();
 		}
 	}
+}
 
 void VideoWrapper::newFrame(const Image<ColorRgb> &image)
 {

libsrc/hyperion/CaptureCont.cpp

@@ -127,8 +127,8 @@ void CaptureCont::handleSettingsUpdate(settings::type type, const QJsonDocument&
 			_systemCaptPrio = obj["systemPriority"].toInt(250);
 		}
 
-		setV4LCaptureEnable(obj["v4lEnable"].toBool(true));
+		setV4LCaptureEnable(obj["v4lEnable"].toBool(false));
-		setSystemCaptureEnable(obj["systemEnable"].toBool(true));
+		setSystemCaptureEnable(obj["systemEnable"].toBool(false));
 	}
 }
 

libsrc/hyperion/GrabberWrapper.cpp

@@ -165,12 +165,16 @@ void GrabberWrapper::updateTimer(int interval)
 }
 
 void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocument& config)
-{
+{	if(type == settings::SYSTEMCAPTURE && !_grabberName.startsWith("V4L"))
-	if(type == settings::SYSTEMCAPTURE && !_grabberName.startsWith("V4L"))
 	{
 		// extract settings
 		const QJsonObject& obj = config.object();
 
+		// global grabber state
+		GLOBAL_GRABBER_SYS_ENABLE = obj["enable"].toBool(false);
+
+		if (GLOBAL_GRABBER_SYS_ENABLE)
+		{
 			// width/height
 			_ggrabber->setWidthHeight(obj["width"].toInt(96), obj["height"].toInt(96));
 
@@ -194,6 +198,7 @@ void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocume
 			updateTimer(1000/obj["fps"].toInt(10));
 		}
 	}
+}
 
 void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyperionInd, bool listen)
 {
@@ -204,7 +209,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 		else
 			GRABBER_SYS_CLIENTS.remove(hyperionInd);
 
-		if(GRABBER_SYS_CLIENTS.empty())
+		if(GRABBER_SYS_CLIENTS.empty() || !GLOBAL_GRABBER_SYS_ENABLE)
 			stop();
 		else
 			start();
@@ -216,7 +221,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 		else
 			GRABBER_V4L_CLIENTS.remove(hyperionInd);
 
-		if(GRABBER_V4L_CLIENTS.empty())
+		if(GRABBER_V4L_CLIENTS.empty() || !GLOBAL_GRABBER_V4L_ENABLE)
 			stop();
 		else
 			start();
@@ -226,8 +231,6 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 void GrabberWrapper::tryStart()
 {
 	// verify start condition
-	if((_grabberName.startsWith("V4L") && !GRABBER_V4L_CLIENTS.empty()) || (!_grabberName.startsWith("V4L") && !GRABBER_SYS_CLIENTS.empty()))
+	if(!_grabberName.startsWith("V4L") && !GRABBER_SYS_CLIENTS.empty() && GLOBAL_GRABBER_SYS_ENABLE)
-	{
 		start();
 }
-}

src/hyperiond/hyperiond.cpp

@@ -493,7 +493,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberFramebuffer(grabberConfig);
 				}
 				#ifdef ENABLE_FB
-				_fbGrabber->tryStart();
+					_dispmanx->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
+					_dispmanx->tryStart();
 				#endif
 			}
 			else if (type == "dispmanx")
@@ -503,6 +504,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberDispmanx();
 				}
 				#ifdef ENABLE_DISPMANX
+					_dispmanx->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_dispmanx->tryStart();
 				#endif
 			}
@@ -513,6 +515,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberAmlogic();
 				}
 				#ifdef ENABLE_AMLOGIC
+					_amlGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_amlGrabber->tryStart();
 				#endif
 			}
@@ -523,6 +526,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberOsx(grabberConfig);
 				}
 				#ifdef ENABLE_OSX
+					_osxGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_osxGrabber->tryStart();
 				#endif
 			}
@@ -533,6 +537,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberX11(grabberConfig);
 				}
 				#ifdef ENABLE_X11
+					_x11Grabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_x11Grabber->tryStart();
 				#endif
 			}
@@ -543,6 +548,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberXcb(grabberConfig);
 				}
 				#ifdef ENABLE_XCB
+					_xcbGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_xcbGrabber->tryStart();
 				#endif
 			}
@@ -553,6 +559,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberQt(grabberConfig);
 				}
 				#ifdef ENABLE_QT
+					_qtGrabber->handleSettingsUpdate(settings::SYSTEMCAPTURE, getSetting(settings::SYSTEMCAPTURE));
 					_qtGrabber->tryStart();
 				#endif
 			}
@@ -563,7 +570,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 					createGrabberDx(grabberConfig);
 				}
 				#ifdef ENABLE_DX
-				_dxGrabber->tryStart();
+				// _dxGrabber->tryStart();
 				#endif
 			}
 			else
@@ -577,11 +584,8 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 	else if (settingsType == settings::V4L2)
 	{
 
-#if defined(ENABLE_CEC) || defined(ENABLE_V4L2) || defined(ENABLE_MF)
-		const QJsonObject& grabberConfig = config.object();
-#endif
-
 #ifdef ENABLE_CEC
+		const QJsonObject& grabberConfig = config.object();
 		if (_cecHandler != nullptr && grabberConfig["cecDetection"].toBool(false))
 		{
 			QMetaObject::invokeMethod(_cecHandler, "start", Qt::QueuedConnection);
@@ -596,7 +600,7 @@ void HyperionDaemon::handleSettingsUpdate(settings::type settingsType, const QJs
 		if (_videoGrabber == nullptr)
 		{
 			_videoGrabber = new VideoWrapper();
-			_videoGrabber->handleSettingsUpdate(settings::V4L2, QJsonDocument(grabberConfig));
+			_videoGrabber->handleSettingsUpdate(settings::V4L2, getSetting(settings::V4L2));
 
 #if defined(ENABLE_MF)
 			Debug(_log, "Media Foundation grabber created");