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

Merge branch 'add_effect_engine' of https://github.com/tvdzwan/hyperion.git into add_effect_engine

Browse Source 
Former-commit-id: 34587c803308d43d2fabf3eed5e19727acf18901
This commit is contained in:
T. van der Zwan
2013-12-13 21:58:17 +00:00
parent b38a98c3ad 0cac2ce916
commit f8fdcb0c10
9 changed files with 8 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/hyperion/Hyperion.cpp
View File

@@ -510,11 +510,6 @@ int Hyperion::setEffect(const std::string &effectName, const Json::Value &args,
return _effectEngine->runEffect(effectName, args, priority, timeout);
}
int Hyperion::setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout)
{
return _effectEngine->runEffectScript(script, args, priority, timeout);
}
void Hyperion::update()
{
// Update the muxer, cleaning obsolete priorities