From b46d231f75d3ad41e1cb3185f8405b89f4b02984 Mon Sep 17 00:00:00 2001 From: AEtHeLsYn Date: Mon, 21 Mar 2016 17:07:02 +0100 Subject: [PATCH] Update JsonClientConnection.cpp Former-commit-id: fef896ef86f04901cf2227a0897dd9ea999325b7 --- libsrc/jsonserver/JsonClientConnection.cpp | 36 ++++++---------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/libsrc/jsonserver/JsonClientConnection.cpp b/libsrc/jsonserver/JsonClientConnection.cpp index e6275ae6..d146b1c8 100644 --- a/libsrc/jsonserver/JsonClientConnection.cpp +++ b/libsrc/jsonserver/JsonClientConnection.cpp @@ -595,20 +595,12 @@ void JsonClientConnection::handleCorrectionCommand(const Json::Value &message) return; } - if (correction.isMember("red")) + if (correction.isMember("correctionValues")) { - colorCorrection->_rgbCorrection.setcorrectionR(correction["red"].asInt()); - } - - if (correction.isMember("green")) - { - colorCorrection->_rgbCorrection.setcorrectionG(correction["green"].asInt()); - } - - if (correction.isMember("blue")) - { - colorCorrection->_rgbCorrection.setcorrectionB(correction["blue"].asInt()); - } + const Json::Value & values = correction["correctionValues"]; + colorCorrection->_rgbCorrection.setcorrectionR(values[0u].asInt()); + colorCorrection->_rgbCorrection.setcorrectionG(values[1u].asInt()); + colorCorrection->_rgbCorrection.setcorrectionB(values[2u].asInt()); // commit the changes _hyperion->correctionsUpdated(); @@ -628,20 +620,12 @@ void JsonClientConnection::handleTemperatureCommand(const Json::Value &message) return; } - if (temperature.isMember("red")) + if (temperature.isMember("correctionValues")) { - colorTemperature->_rgbCorrection.setcorrectionR(temperature["red"].asInt()); - } - - if (temperature.isMember("green")) - { - colorTemperature->_rgbCorrection.setcorrectionG(temperature["green"].asInt()); - } - - if (temperature.isMember("blue")) - { - colorTemperature->_rgbCorrection.setcorrectionB(temperature["blue"].asInt()); - } + const Json::Value & values = temperature["correctionValues"]; + colorTemperature->_rgbCorrection.setcorrectionR(values[0u].asInt()); + colorTemperature->_rgbCorrection.setcorrectionG(values[1u].asInt()); + colorTemperature->_rgbCorrection.setcorrectionB(values[2u].asInt()); // commit the changes _hyperion->temperaturesUpdated();