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

update

Browse Source
This commit is contained in:
brindosch
2017-02-21 14:42:49 +01:00
parent 8a6c1fdab3
commit 50fc89e800
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libsrc/hyperion/Hyperion.cpp
View File

@@ -504,7 +504,7 @@ bool Hyperion::configWriteable()
}
void Hyperion::registerPriority(const std::string name, const int priority)
void Hyperion::registerPriority(const std::string name, const int priority, const QString origin)
{
Info(_log, "Register new input source named '%s' for priority channel '%d'", name.c_str(), priority );
@@ -514,7 +514,7 @@ void Hyperion::registerPriority(const std::string name, const int priority)
"Input source '%s' uses same priority channel (%d) as '%s'.", name.c_str(), priority, entry.first.c_str());
}
_priorityRegister.emplace(name,priority);
_priorityRegister.emplace(name,priority,origin);
}
void Hyperion::unRegisterPriority(const std::string name)
@@ -688,14 +688,14 @@ const std::list<EffectSchema> & Hyperion::getEffectSchemas()
return _effectEngine->getEffectSchemas();
}
int Hyperion::setEffect(const QString &effectName, int priority, int timeout)
int Hyperion::setEffect(const QString &effectName, int priority, int timeout, const QString origin)
{
return _effectEngine->runEffect(effectName, priority, timeout);
return _effectEngine->runEffect(effectName, priority, timeout, origin);
}
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout, QString pythonScript)
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout, QString pythonScript, const QString origin)
{
return _effectEngine->runEffect(effectName, args, priority, timeout, pythonScript);
return _effectEngine->runEffect(effectName, args, priority, timeout, pythonScript, origin);
}
void Hyperion::setLedMappingType(int mappingType)