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

update

Browse Source
This commit is contained in:
brindosch
2017-02-21 14:42:49 +01:00
parent 8a6c1fdab3
commit 50fc89e800
6 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/effectengine/EffectEngine.h
View File

@@ -45,7 +45,7 @@ public:
public slots:
/// Run the specified effect on the given priority channel and optionally specify a timeout
int runEffect(const QString &effectName, int priority, int timeout = -1)
int runEffect(const QString &effectName, int priority, int timeout = -1, const QString origin="System")
{
return runEffect(effectName, QJsonObject(), priority, timeout);
};
@@ -68,7 +68,7 @@ private:
bool loadEffectSchema(const QString & path, const QString & effectSchemaFile, EffectSchema &effectSchema);
/// Run the specified effect on the given priority channel and optionally specify a timeout
int runEffectScript(const QString &script, const QString &name, const QJsonObject & args, int priority, int timeout = -1);
int runEffectScript(const QString &script, const QString &name, const QJsonObject & args, int priority, int timeout = -1, const QString origin="System");
private:
Hyperion * _hyperion;

7
include/hyperion/Hyperion.h
View File

@@ -133,7 +133,8 @@ public:
/// register a input source to a priority channel
/// @param name uniq name of input source
/// @param priority priority channel
void registerPriority(const std::string name, const int priority);
/// @param origin External setter
void registerPriority(const std::string name, const int priority, const QString origin="System");
/// unregister a input source to a priority channel
/// @param name uniq name of input source
@@ -243,14 +244,14 @@ public slots:
/// @param effectName Name of the effec to run
/// @param priority The priority channel of the effect
/// @param timeout The timeout of the effect (after the timout, the effect will be cleared)
int setEffect(const QString & effectName, int priority, int timeout = -1);
int setEffect(const QString & effectName, int priority, int timeout = -1, const QString origin="System");
/// 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 timeout The timeout of the effect (after the timout, the effect will be cleared)
int setEffect(const QString & effectName, const QJsonObject & args, int priority, int timeout = -1, QString pythonScript = "");
int setEffect(const QString & effectName, const QJsonObject & args, int priority, int timeout = -1, QString pythonScript = "", const QString origin="System");
/// sets the methode how image is maped to leds
void setLedMappingType(int mappingType);