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

Final fixex

Browse Source 
Former-commit-id: 7b2e1a33ab7705dddadfa1ec99d3d7c379ab10dd
This commit is contained in:
AEtHeLsYn 2016-03-13 21:14:22 +01:00
parent ae23c96b91
commit 1f1aee0c37
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsrc/hyperion/hyperion.schema.json
View File

@ -38,7 +38,7 @@
"type":"object", "type":"object",
"required":false, "required":false,
"properties": { "properties": {
"hsv" : { "hsv" : {
"type" : "object", "type" : "object",
"required" : false, "required" : false,
"properties" : { "properties" : {

6
libsrc/jsonserver/JsonClientConnection.cpp
View File

@ -232,7 +232,7 @@ void JsonClientConnection::handleMessage(const std::string &messageString)
sendErrorReply("Error while validating json: " + errors); sendErrorReply("Error while validating json: " + errors);
return; return;
} }
// switch over all possible commands and handle them // switch over all possible commands and handle them
if (command == "color") if (command == "color")
handleColorCommand(message); handleColorCommand(message);
@ -483,7 +483,7 @@ void JsonClientConnection::handleTransformCommand(const Json::Value &message)
//sendErrorReply(std::string("Incorrect transform identifier: ") + transformId); //sendErrorReply(std::string("Incorrect transform identifier: ") + transformId);
return; return;
} }
if (transform.isMember("saturationGain")) if (transform.isMember("saturationGain"))
{ {
colorTransform->_hsvTransform.setSaturationGain(transform["saturationGain"].asDouble()); colorTransform->_hsvTransform.setSaturationGain(transform["saturationGain"].asDouble());
@ -535,7 +535,7 @@ void JsonClientConnection::handleTransformCommand(const Json::Value &message)
colorTransform->_rgbGreenTransform.setWhitelevel(values[1u].asDouble()); colorTransform->_rgbGreenTransform.setWhitelevel(values[1u].asDouble());
colorTransform->_rgbBlueTransform .setWhitelevel(values[2u].asDouble()); colorTransform->_rgbBlueTransform .setWhitelevel(values[2u].asDouble());
} }
// commit the changes // commit the changes
_hyperion->transformsUpdated(); _hyperion->transformsUpdated();

2
src/hyperion-remote/hyperion-remote.cpp
View File

@ -177,7 +177,7 @@ int main(int argc, char * argv[])
if (argGamma.isSet()) gamma = argGamma.getValue(); if (argGamma.isSet()) gamma = argGamma.getValue();
if (argBlacklevel.isSet()) blacklevel = argBlacklevel.getValue(); if (argBlacklevel.isSet()) blacklevel = argBlacklevel.getValue();
if (argWhitelevel.isSet()) whitelevel = argWhitelevel.getValue(); if (argWhitelevel.isSet()) whitelevel = argWhitelevel.getValue();
connection.setTransform( connection.setTransform(
argId.isSet() ? &transId : nullptr, argId.isSet() ? &transId : nullptr,
argSaturation.isSet() ? &saturation : nullptr, argSaturation.isSet() ? &saturation : nullptr,