This commit is contained in:
Paulchen Panther
2021-05-02 19:04:58 +02:00
parent b06126ee28
commit 3fb0ece3a2
8 changed files with 42 additions and 54 deletions

View File

@@ -205,20 +205,8 @@ bool API::setComponentState(const QString &comp, bool &compState, QString &reply
if (component != COMP_INVALID)
{
if (component == COMP_FORWARDER ||
component == COMP_GRABBER ||
component == COMP_V4L ||
component == COMP_FLATBUFSERVER ||
component == COMP_PROTOSERVER)
{
QMetaObject::invokeMethod(_instanceManager, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState));
return true;
}
else
{
QMetaObject::invokeMethod(_hyperion, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState));
return true;
}
QMetaObject::invokeMethod(_hyperion, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState));
return true;
}
replyMsg = QString("Unknown component name: %1").arg(comp);
return false;

View File

@@ -90,7 +90,6 @@ bool HyperionIManager::startInstance(quint8 inst, bool block, QObject* caller, i
connect(hyperion, &Hyperion::videoMode, this, &HyperionIManager::requestVideoMode);
// to Hyperion
connect(this, &HyperionIManager::newVideoMode, hyperion, &Hyperion::newVideoMode);
connect(this, &HyperionIManager::compStateChangeRequest, hyperion, &Hyperion::compStateChangeRequest);
// add to queue and start
_startQueue << inst;