frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

Removed runEffectScript from Hyperion class

Browse Source 
Former-commit-id: 459b9178cc138d54a238ae7c72bb2a52d4bfcc3f
This commit is contained in:
johan 2013-12-13 22:41:24 +01:00
parent 89252d45d0
commit c751561f2f
5 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
deploy/hyperion.tar.gz
View File

Binary file not shown.

1
deploy/hyperion.tar.gz.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e7d6f548d20e8a1dd817e4200fbedff8f7b042f9

7
include/effectengine/EffectEngine.h
View File

@ -35,9 +35,6 @@ public slots:
/// Run the specified effect on the given priority channel and optionally specify a timeout /// 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); 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 /// Clear any effect running on the provided channel
void channelCleared(int priority); void channelCleared(int priority);
@ -47,6 +44,10 @@ public slots:
private slots: private slots:
void effectFinished(Effect * effect); void effectFinished(Effect * effect);
private:
/// 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);
private: private:
Hyperion * _hyperion; Hyperion * _hyperion;

7
include/hyperion/Hyperion.h
View File

@ -157,13 +157,6 @@ public slots:
/// @param timout The timeout of the effect (after the timout, the effect will be cleared) /// @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); 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: public:
static LedDevice * createDevice(const Json::Value & deviceConfig); static LedDevice * createDevice(const Json::Value & deviceConfig);
static ColorOrder createColorOrder(const Json::Value & deviceConfig); static ColorOrder createColorOrder(const Json::Value & deviceConfig);

5
libsrc/hyperion/Hyperion.cpp
View File

@ -502,11 +502,6 @@ int Hyperion::setEffect(const std::string &effectName, const Json::Value &args,
return _effectEngine->runEffect(effectName, args, priority, timeout); 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() void Hyperion::update()
{ {
// Update the muxer, cleaning obsolete priorities // Update the muxer, cleaning obsolete priorities