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

effects included in hyperiond binary as qtResource (#237)

Browse Source 
* implement effects included in hyperiond  binary

* cleanup

* remove install of effects dir. People who wants to develop effects has to copy them from github
effect params for initial effects can be changed in config permanently and other effect params can be changed
via json (currently only temporarily)

* fix schema of fadecandy
webui fix display of specific led options

* add leddevice write support

* cleanup

* webui: tune hue code

* when use json effect definition from putsiede hyperiond but want to use py script from inside hyperiond use ad a :
e.g. fade.py needs a fade.py near the json file, but :fade.py is taken from resource inside hyperiond

* add ability to di

* add abiloty to diable effcts via hyperion config

* use effect name instead of script in active effects and prio register

* finally solve open file handle during effect is playing. Now script is read before, then file closed and then t is run by python

* fix some webui things
- led config tabs
- inital loading screen

optimize qrc file generation
fix compile warning in hyperion.cpp

* cleanup

* more cleanup
This commit is contained in:
redPanther
2016-09-13 11:51:16 +02:00
committed by GitHub
parent d097995a74
commit adfe2a4b23
54 changed files with 205 additions and 8001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/effectengine/ActiveEffectDefinition.h
View File

@@ -9,6 +9,7 @@
struct ActiveEffectDefinition
{
std::string script;
std::string name;
int priority;
int timeout;
Json::Value args;

5
include/effectengine/EffectEngine.h
View File

@@ -2,6 +2,7 @@
// Qt includes
#include <QObject>
#include <QString>
// Json includes
#include <json/value.h>
@@ -30,7 +31,7 @@ public:
const std::list<ActiveEffectDefinition> & getActiveEffects();
static bool loadEffectDefinition(const std::string & path, const std::string & effectConfigFile, EffectDefinition &effectDefinition);
static bool loadEffectDefinition(const QString & path, const QString & effectConfigFile, EffectDefinition &effectDefinition);
public slots:
/// Run the specified effect on the given priority channel and optionally specify a timeout
@@ -50,7 +51,7 @@ private slots:
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);
int runEffectScript(const std::string &script, const std::string &name, const Json::Value & args, int priority, int timeout = -1);
private:
Hyperion * _hyperion;