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

libsrc/api/JSONRPC_schema/schema-create-effect.json

@@ -24,6 +24,10 @@
 		{
 			"type" : "object",
 			"required" : true
+		},
+		"imageData" : {
+			"type" : "string",
+			"required" : false
 		}
 	},
 	"additionalProperties": false

libsrc/api/JSONRPC_schema/schema-effect.json

@@ -44,6 +44,10 @@
 		"pythonScript" : {
 			"type" : "string",
 			"required" : false
+		},
+		"imageData" : {
+			"type" : "string",
+			"required" : false
 		}
 	},
 	"additionalProperties": false

libsrc/api/JsonAPI.cpp

@@ -12,9 +12,6 @@
 #include <QImage>
 #include <QBuffer>
 #include <QByteArray>
-// #include <QFileInfo>
-// #include <QDir>
-// #include <QIODevice>
 #include <QDateTime>
 
 // hyperion includes
@@ -180,7 +177,7 @@ void JsonAPI::handleImageCommand(const QJsonObject& message, const QString& comm
 	sendSuccessReply(command, tan);
 }
 
-void JsonAPI::handleEffectCommand(const QJsonObject& message, const QString& command, const int tan)
+void JsonAPI::handleEffectCommand(const QJsonObject &message, const QString &command, const int tan)
 {
 	emit forwardJsonMessage(message);
 
@@ -191,16 +188,12 @@ void JsonAPI::handleEffectCommand(const QJsonObject& message, const QString& com
 	QString origin = message["origin"].toString() + "@"+_peerAddress;
 	const QJsonObject & effect = message["effect"].toObject();
 	const QString & effectName = effect["name"].toString();
+	const QString & data = message["imageData"].toString("").toUtf8();
 
 	// set output
-	if (effect.contains("args"))
-	{
-		_hyperion->setEffect(effectName, effect["args"].toObject(), priority, duration, pythonScript, origin);
-	}
-	else
-	{
-		_hyperion->setEffect(effectName, priority, duration, origin);
-	}
+	 (effect.contains("args"))
+		? _hyperion->setEffect(effectName, effect["args"].toObject(), priority, duration, pythonScript, origin, data)
+		: _hyperion->setEffect(effectName, priority, duration, origin);
 
 	// send reply
 	sendSuccessReply(command, tan);