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

Adding the possibility to test new Effects ... (#282)

Browse Source 
* Update effects_configurator.html

* Update content_effectsconfigurator.js

* Update hyperion.js

* Update de.json

* Add argument QString "pythonScript" to runEffect function

* Update Hyperion.h

* Update EffectEngine.cpp

* Update Hyperion.cpp

* Update JsonClientConnection.cpp

* Update schema-effect.json
This commit is contained in:
Paulchen Panther
2016-10-30 22:59:45 +01:00
committed by brindosch
parent 864538f188
commit 08dfec20c5
10 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/hyperion/Hyperion.cpp
View File

@@ -824,9 +824,9 @@ int Hyperion::setEffect(const QString &effectName, int priority, int timeout)
return _effectEngine->runEffect(effectName, priority, timeout);
}
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout)
int Hyperion::setEffect(const QString &effectName, const QJsonObject &args, int priority, int timeout, QString pythonScript)
{
return _effectEngine->runEffect(effectName, args, priority, timeout);
return _effectEngine->runEffect(effectName, args, priority, timeout, pythonScript);
}
void Hyperion::update()