Fixes for HyperHDR v20beta2 (#787)

awawa-dev · Mar 9, 2024 · fc83579 · fc83579
1 parent 695c6a7
commit fc83579
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/sources/base/HyperHdrManager.cpp b/sources/base/HyperHdrManager.cpp
@@ -196,7 +196,11 @@ void HyperHdrManager::hibernate(bool wakeUp, hyperhdr::SystemComponent source)
 
 		if (_hasEffect)
 		{
-			toggleGrabbersAllInstances(wakeUp);
+			if (wakeUp)
+				QTimer::singleShot(3000, this, [this, wakeUp]() { toggleGrabbersAllInstances(wakeUp);  });
+			else
+				toggleGrabbersAllInstances(wakeUp);
+
 			return;
 		}
 	}
@@ -209,7 +213,7 @@ void HyperHdrManager::hibernate(bool wakeUp, hyperhdr::SystemComponent source)
 	else
 	{
 		Warning(_log, "The system is going to wake up");
-		QTimer::singleShot(3000, [this]() { toggleStateAllInstances(true);  });
+		QTimer::singleShot(3000, this, [this]() { toggleStateAllInstances(true);  });
 	}
 }
 

diff --git a/sources/base/LedCalibration.cpp b/sources/base/LedCalibration.cpp
@@ -101,9 +101,10 @@ void LedCalibration::setAdjustmentForLed(int index, std::shared_ptr<ColorCalibra
 	Debug(_log, "Calibration config '%i' for LED segment: [%d, %d]", index, startLed, endLed);
 
 	for (size_t iLed = startLed; iLed <= endLed; ++iLed)
-	{
-		_perLedConfig[iLed] = adjustment;
-	}
+		if (iLed < 0 || iLed >= _perLedConfig.size())
+			Error(_log, "Cannot apply calibration config because LED index '%i' does not exist", iLed);
+		else	
+			_perLedConfig[iLed] = adjustment;
 }
 
 bool LedCalibration::verifyAdjustments() const

diff --git a/sources/base/RawUdpServer.cpp b/sources/base/RawUdpServer.cpp
@@ -57,7 +57,7 @@ RawUdpServer::~RawUdpServer()
 {
 	stopServer();
 
-	std::cout << "RawUdpServer exists now" << std::endl;
+	std::cout << "RawUdpServer exits now" << std::endl;
 }
 
 void RawUdpServer::initServer()

diff --git a/sources/base/SystemControl.cpp b/sources/base/SystemControl.cpp
@@ -63,7 +63,7 @@ SystemControl::~SystemControl()
 {
 	emit GlobalSignals::getInstance()->SignalRequestComponent(hyperhdr::COMP_SYSTEMGRABBER, int(_hyperhdr->getInstanceIndex()), false);
 
-	std::cout << "SystemControl exists now" << std::endl;
+	std::cout << "SystemControl exits now" << std::endl;
 }
 
 quint8 SystemControl::getCapturePriority()
@@ -78,10 +78,13 @@ bool SystemControl::isCEC()
 
 void SystemControl::handleSysImage(const QString& name, const Image<ColorRgb>& image)
 {
+	if (!_sysCaptEnabled)
+		return;
+
 	if (_sysCaptName != name)
 	{
-		_hyperhdr->registerInput(_sysCaptPrio, hyperhdr::COMP_SYSTEMGRABBER, "System", name);
 		_sysCaptName = name;
+		_hyperhdr->registerInput(_sysCaptPrio, hyperhdr::COMP_SYSTEMGRABBER, "System", _sysCaptName);
 	}
 
 	_alive = true;
@@ -98,15 +101,14 @@ void SystemControl::setSysCaptureEnable(bool enable)
 	{
 		if (enable)
 		{
-			_hyperhdr->registerInput(_sysCaptPrio, hyperhdr::COMP_SYSTEMGRABBER);
+			_hyperhdr->registerInput(_sysCaptPrio, hyperhdr::COMP_SYSTEMGRABBER, "System", _sysCaptName);
 			connect(GlobalSignals::getInstance(), &GlobalSignals::SignalNewSystemImage, this, &SystemControl::handleSysImage, Qt::UniqueConnection);
 		}
 		else
 		{
 			disconnect(GlobalSignals::getInstance(), &GlobalSignals::SignalNewSystemImage, this, &SystemControl::handleSysImage);
 			_hyperhdr->clear(_sysCaptPrio);
 			_sysInactiveTimer->stop();
-			_sysCaptName = "";
 		}
 
 		_sysCaptEnabled = enable;

diff --git a/sources/base/VideoControl.cpp b/sources/base/VideoControl.cpp
@@ -68,7 +68,7 @@ VideoControl::~VideoControl()
 	emit GlobalSignals::getInstance()->SignalRequestComponent(hyperhdr::COMP_VIDEOGRABBER, int(_hyperhdr->getInstanceIndex()), false);
 	emit GlobalSignals::getInstance()->SignalRequestComponent(hyperhdr::COMP_CEC, int(_hyperhdr->getInstanceIndex()), false);
 
-	std::cout << "VideoControl exists now" << std::endl;
+	std::cout << "VideoControl exits now" << std::endl;
 }
 
 bool VideoControl::isCEC()
@@ -93,6 +93,9 @@ void VideoControl::handleUsbImage()
 {
 	Image<ColorRgb> image;
 	QString name;
+
+	if (!_usbCaptEnabled)
+		return;
 
 	incoming.mutex.lock();
 	{
@@ -109,8 +112,8 @@ void VideoControl::handleUsbImage()
 
 	if (_usbCaptName != name)
 	{
-		_hyperhdr->registerInput(_usbCaptPrio, hyperhdr::COMP_VIDEOGRABBER, "System", name);
 		_usbCaptName = name;
+		_hyperhdr->registerInput(_usbCaptPrio, hyperhdr::COMP_VIDEOGRABBER, "System", _usbCaptName);
 	}
 
 	_alive = true;
@@ -127,15 +130,14 @@ void VideoControl::setUsbCaptureEnable(bool enable)
 	{
 		if (enable)
 		{
-			_hyperhdr->registerInput(_usbCaptPrio, hyperhdr::COMP_VIDEOGRABBER);
+			_hyperhdr->registerInput(_usbCaptPrio, hyperhdr::COMP_VIDEOGRABBER, "System", _usbCaptName);
 			connect(GlobalSignals::getInstance(), &GlobalSignals::SignalNewVideoImage, this, &VideoControl::handleIncomingUsbImage, static_cast<Qt::ConnectionType>(Qt::DirectConnection | Qt::UniqueConnection));
 		}
 		else
 		{
 			disconnect(GlobalSignals::getInstance(), &GlobalSignals::SignalNewVideoImage, this, &VideoControl::handleIncomingUsbImage);
 			_hyperhdr->clear(_usbCaptPrio);
 			_usbInactiveTimer->stop();
-			_usbCaptName = "";
 		}
 
 		_usbCaptEnabled = enable;

diff --git a/sources/leddevice/LedDeviceWrapper.cpp b/sources/leddevice/LedDeviceWrapper.cpp
@@ -56,6 +56,7 @@ void LedDeviceWrapper::createLedDevice(QJsonObject config, int smoothingInterval
 	_ledDevice = std::unique_ptr<LedDevice, void(*)(LedDevice*)>(
 		LedDeviceFactory::construct(config),
 		[](LedDevice* oldLed) {
+			oldLed->stop();
 			hyperhdr::THREAD_REMOVER(QString("LedDevice"), oldLed->thread(), oldLed);
 		}
 	);