mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
Commits from @MartB and more ...
- Commit: 1d9165f403
- New default QT capture implementation
- UploadHandler added to Effects Configurator to allow uploading GIF files
- Docker compile script and instruction
- Travis Fix
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
//impl
|
||||
PyThreadState* mainThreadState;
|
||||
|
||||
Effect::Effect(Hyperion* hyperion, int priority, int timeout, const QString & script, const QString & name, const QJsonObject & args)
|
||||
Effect::Effect(Hyperion *hyperion, int priority, int timeout, const QString &script, const QString &name, const QJsonObject &args, const QString &imageData)
|
||||
: QThread()
|
||||
, _hyperion(hyperion)
|
||||
, _priority(priority)
|
||||
@@ -33,6 +33,7 @@ Effect::Effect(Hyperion* hyperion, int priority, int timeout, const QString & sc
|
||||
, _script(script)
|
||||
, _name(name)
|
||||
, _args(args)
|
||||
, _imageData(imageData)
|
||||
, _endTime(-1)
|
||||
, _colors()
|
||||
, _imageSize(hyperion->getLedGridSize())
|
||||
|
Reference in New Issue
Block a user