- Fixed Effect not suspended when instance is stopped (#1586)

- Fixed Background effect is started when instance is disabled

Author: Lord-Grey

CHANGELOG.md

@@ -75,6 +75,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed Smoothing (#1863)
 - Fixed Crash when XCB,X11 was configured and display manager changed to Wayland
 - Fixed Target-directory not correctly build when exporting effects
+- Fixed Effect not suspended when instance is stopped (#1586)
+- Fixed Background effect is started when instance is disabled 
 
 **JSON-API**
 - Refactored JSON-API to ensure consistent authorization behaviour across sessions and single requests with token authorization.

include/hyperion/BGEffectHandler.h

@@ -52,8 +52,6 @@ private slots:
 
 	QJsonDocument _bgEffectConfig;
 	bool _isBgEffectEnabled;
-
-	bool _isSuspended;
 };
 
 #endif // BGEFFECTHANDLER_H

libsrc/effectengine/EffectEngine.cpp

@@ -44,6 +44,22 @@ EffectEngine::EffectEngine(Hyperion * hyperion)
 	// get notifications about refreshed effect list
 	connect(_effectFileHandler, &EffectFileHandler::effectListChanged, this, &EffectEngine::handleUpdatedEffectList);
 
+	// Stop all effects when instance is disabled, restart the same when enabled
+	connect(_hyperion, &Hyperion::compStateChangeRequest, this, [=](hyperion::Components component, bool enable) {
+		if (component == hyperion::COMP_ALL)
+		{
+			if (enable)
+			{
+				startCachedEffects();
+			}
+			else
+			{
+				cacheRunningEffects();
+				stopAllEffects();
+			}
+		}
+	});
+
 	// register smooth cfgs and fill available effects
 	handleUpdatedEffectList();
 }

libsrc/hyperion/BGEffectHandler.cpp

@@ -6,19 +6,13 @@ BGEffectHandler::BGEffectHandler(Hyperion* hyperion)
 	: QObject(hyperion)
 	, _hyperion(hyperion)
 	, _isBgEffectEnabled(false)
-	, _isSuspended(false)
 {
 	QString subComponent = parent()->property("instance").toString();
 	_log = Logger::getInstance("HYPERION", subComponent);
 
 	QObject::connect(_hyperion, &Hyperion::settingsChanged, this, &BGEffectHandler::handleSettingsUpdate);
 	QObject::connect(_hyperion->getMuxerInstance().get(), &PriorityMuxer::prioritiesChanged, this, &BGEffectHandler::handlePriorityUpdate);
 
-	// listen for suspend/resume requests, to not start a background effect when system goes into suspend mode
-	connect(_hyperion, &Hyperion::suspendRequest, this, [=] (bool isSuspended) {
-		_isSuspended = isSuspended;
-	});
-
 	// initialization
 	handleSettingsUpdate(settings::BGEFFECT, _hyperion->getSetting(settings::BGEFFECT));
 }
@@ -90,9 +84,13 @@ void BGEffectHandler::handlePriorityUpdate(int currentPriority)
 		Debug(_log,"Stop background (color-) effect as it moved out of scope");
 		_hyperion->clear(PriorityMuxer::BG_PRIORITY);
 	}
-	else if (!_isSuspended && currentPriority == PriorityMuxer::LOWEST_PRIORITY && _isBgEffectEnabled)
+	// Do not start a background effect when the overall instance is disabled
+	else if (_hyperion->isComponentEnabled(hyperion::COMP_ALL))
 	{
-		Debug(_log,"Start background (color-) effect as it moved in scope");
-		emit handleSettingsUpdate (settings::BGEFFECT, _bgEffectConfig);
+		if (currentPriority == PriorityMuxer::LOWEST_PRIORITY && _isBgEffectEnabled)
+		{
+			Debug(_log, "Start background (color-) effect as it moved in scope");
+			emit handleSettingsUpdate(settings::BGEFFECT, _bgEffectConfig);
+		}
 	}
 }

libsrc/hyperion/Hyperion.cpp

@@ -361,7 +361,7 @@ int Hyperion::isComponentEnabled(hyperion::Components comp) const
 void Hyperion::setSuspend(bool isSuspend)
 {
 	bool const enable = !isSuspend;
-	emit compStateChangeRequestAll(enable);
+	emit compStateChangeRequest(hyperion::COMP_ALL, enable);
 }
 
 void Hyperion::setIdle(bool isIdle)