frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 2.0.0-alpha.10

Browse Source
This commit is contained in:
Paulchen-Panther 2021-07-17 21:31:39 +02:00
parent 3476409ed4
commit 4f3c853263
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libsrc/hyperion/GrabberWrapper.cpp
View File

@ -178,6 +178,9 @@ void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocume
{ {
// extract settings // extract settings
const QJsonObject& obj = config.object(); const QJsonObject& obj = config.object();
// save current state
bool isEnabled = getSysGrabberState();
// set global grabber state // set global grabber state
setSysGrabberState(obj["enable"].toBool(false)); setSysGrabberState(obj["enable"].toBool(false));
@ -203,6 +206,12 @@ void GrabberWrapper::handleSettingsUpdate(settings::type type, const QJsonDocume
_ggrabber->setFramerate(obj["fps"].toInt(DEFAULT_RATE_HZ)); _ggrabber->setFramerate(obj["fps"].toInt(DEFAULT_RATE_HZ));
// eval new update time // eval new update time
updateTimer(_ggrabber->getUpdateInterval()); updateTimer(_ggrabber->getUpdateInterval());
// start if current state is not true
if (!isEnabled)
{
start();
}
} }
else else
{ {

2
libsrc/hyperion/SettingsManager.cpp
View File

@ -446,7 +446,7 @@ bool SettingsManager::handleConfigUpgrade(QJsonObject& config)
//Rename element type -> device //Rename element type -> device
if (newFramegrabberConfig.contains("type")) if (newFramegrabberConfig.contains("type"))
{ {
newFramegrabberConfig["device"] = "auto"; //newFramegrabberConfig["type"].toString(); newFramegrabberConfig["device"] = newFramegrabberConfig["type"].toString();
newFramegrabberConfig.remove("type"); newFramegrabberConfig.remove("type");
migrated = true; migrated = true;
} }

2
version
View File

@ -1 +1 @@
2.0.0-alpha.9 2.0.0-alpha.10