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

Changed bootsequence to use the effect engine exclusively

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
include/effectengine/EffectEngine.h
View File

@@ -33,6 +33,9 @@ public slots:
/// Run the specified effect on the given priority channel and optionally specify a timeout
int runEffect(const std::string &effectName, const Json::Value & args, int priority, int timeout = -1);
/// Run the specified effect on the given priority channel and optionally specify a timeout
int runEffectScript(const std::string &script, const Json::Value & args, int priority, int timeout = -1);
/// Clear any effect running on the provided channel
void channelCleared(int priority);

8
include/hyperion/Hyperion.h
View File

@@ -158,10 +158,18 @@ public slots:
/// Run the specified effect on the given priority channel and optionally specify a timeout
/// @param effectName Name of the effec to run
/// @param args arguments of the effect script
/// @param priority The priority channel of the effect
/// @param timout The timeout of the effect (after the timout, the effect will be cleared)
int setEffect(const std::string & effectName, const Json::Value & args, int priority, int timeout = -1);
/// Run the specified effect script on the given priority channel and optionally specify a timeout
/// @param script path of the effect script
/// @param args arguments of the effect script
/// @param priority The priority channel of the effect
/// @param timout The timeout of the effect (after the timout, the effect will be cleared)
int setEffectScript(const std::string &script, const Json::Value &args, int priority, int timeout);
public:
static LedDevice * createDevice(const Json::Value & deviceConfig);
static ColorOrder createColorOrder(const Json::Value & deviceConfig);