From 1f1aee0c37bfa718cfb20f9ea7b6b3f19729f7bb Mon Sep 17 00:00:00 2001 From: AEtHeLsYn Date: Sun, 13 Mar 2016 21:14:22 +0100 Subject: [PATCH] Final fixex Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd --- libsrc/hyperion/hyperion.schema.json | 2 +- libsrc/jsonserver/JsonClientConnection.cpp | 6 +++--- src/hyperion-remote/hyperion-remote.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libsrc/hyperion/hyperion.schema.json b/libsrc/hyperion/hyperion.schema.json index 6ace729f..f30e1a27 100644 --- a/libsrc/hyperion/hyperion.schema.json +++ b/libsrc/hyperion/hyperion.schema.json @@ -38,7 +38,7 @@ "type":"object", "required":false, "properties": { - "hsv" : { + "hsv" : { "type" : "object", "required" : false, "properties" : { diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp index 5a11dc59..ca0cf46e 100644 --- a/libsrc/jsonserver/JsonClientConnection.cpp +++ b/libsrc/jsonserver/JsonClientConnection.cpp @@ -232,7 +232,7 @@ void JsonClientConnection::handleMessage(const std::string &messageString) sendErrorReply("Error while validating json: " + errors); return; } - + // switch over all possible commands and handle them if (command == "color") handleColorCommand(message); @@ -483,7 +483,7 @@ void JsonClientConnection::handleTransformCommand(const Json::Value &message) //sendErrorReply(std::string("Incorrect transform identifier: ") + transformId); return; } - + if (transform.isMember("saturationGain")) { colorTransform->_hsvTransform.setSaturationGain(transform["saturationGain"].asDouble()); @@ -535,7 +535,7 @@ void JsonClientConnection::handleTransformCommand(const Json::Value &message) colorTransform->_rgbGreenTransform.setWhitelevel(values[1u].asDouble()); colorTransform->_rgbBlueTransform .setWhitelevel(values[2u].asDouble()); } - + // commit the changes _hyperion->transformsUpdated(); diff --git a/src/hyperion-remote/hyperion-remote.cpp b/src/hyperion-remote/hyperion-remote.cpp index ee3530df..b59d87e4 100644 --- a/src/hyperion-remote/hyperion-remote.cpp +++ b/src/hyperion-remote/hyperion-remote.cpp @@ -177,7 +177,7 @@ int main(int argc, char * argv[]) if (argGamma.isSet()) gamma = argGamma.getValue(); if (argBlacklevel.isSet()) blacklevel = argBlacklevel.getValue(); if (argWhitelevel.isSet()) whitelevel = argWhitelevel.getValue(); - + connection.setTransform( argId.isSet() ? &transId : nullptr, argSaturation.isSet() ? &saturation : nullptr,