diff --git a/deploy/hyperion.tar.gz b/deploy/hyperion.tar.gz deleted file mode 100644 index c2b7cea9..00000000 Binary files a/deploy/hyperion.tar.gz and /dev/null differ diff --git a/deploy/hyperion.tar.gz.REMOVED.git-id b/deploy/hyperion.tar.gz.REMOVED.git-id new file mode 100644 index 00000000..bf091ef6 --- /dev/null +++ b/deploy/hyperion.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +e7d6f548d20e8a1dd817e4200fbedff8f7b042f9 \ No newline at end of file diff --git a/include/effectengine/EffectEngine.h b/include/effectengine/EffectEngine.h index bf33ef3a..bea45576 100644 --- a/include/effectengine/EffectEngine.h +++ b/include/effectengine/EffectEngine.h @@ -35,9 +35,6 @@ 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); @@ -47,6 +44,10 @@ public slots: private slots: 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: Hyperion * _hyperion; diff --git a/include/hyperion/Hyperion.h b/include/hyperion/Hyperion.h index b4fc0f1c..cb092c2e 100644 --- a/include/hyperion/Hyperion.h +++ b/include/hyperion/Hyperion.h @@ -157,13 +157,6 @@ public slots: /// @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); diff --git a/libsrc/hyperion/Hyperion.cpp b/libsrc/hyperion/Hyperion.cpp index af71daae..2874ffbb 100644 --- a/libsrc/hyperion/Hyperion.cpp +++ b/libsrc/hyperion/Hyperion.cpp @@ -502,11 +502,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