Changed bootsequence to use the effect engine exclusively

Former-commit-id: 8953ef5fb4a0dfd12a4d94f69af6dbdd40aa20f7
This commit is contained in:
johan
2013-12-01 16:35:45 +01:00
parent 9954cb3e0d
commit 068a98b84f
15 changed files with 96 additions and 330 deletions

View File

@@ -481,6 +481,11 @@ 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

View File

@@ -270,13 +270,17 @@
"type" : "object",
"required" : false,
"properties" : {
"type" : {
"type" : "string",
"required" : true
},
"duration_ms" : {
"type" : "integer",
"required" : true
},
"script" : {
"type" : "string",
"required" : true
},
"args" : {
"type" : "object",
"required" : false
}
},
"additionalProperties" : false