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

fix coloradjustment via hyperion remote (#362)

Browse Source 
* - fix coloradjustment via hyperion remote
- several small cleanups/refactorings

* fix color is shown as unknown in json serverinfo

* fix active color is not shown when autoselect is reactivated
This commit is contained in:
redPanther
2017-01-10 19:58:41 +01:00
committed by GitHub
parent ef14eb08c9
commit b2a6366176
15 changed files with 96 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -390,7 +390,7 @@ void JsonClientConnection::handleColorCommand(const QJsonObject& message, const
}
// set output
_hyperion->setColors(priority, colorData, duration);
_hyperion->setColors(priority, colorData, duration, true, hyperion::COMP_COLOR);
// send reply
sendSuccessReply(command, tan);
@@ -595,7 +595,9 @@ void JsonClientConnection::handleServerInfoCommand(const QJsonObject&, const QSt
item["duration_ms"] = int(priorityInfo.timeoutTime_ms - now);
}
item["owner"] = QString("unknown");
item["owner"] = QString(hyperion::componentToIdString(priorityInfo.componentId));
item["componentId"] = priorityInfo.componentId;
item["component"] = QString(hyperion::componentToString(priorityInfo.componentId));
item["active"] = true;
item["visible"] = (priority == currentPriority);
foreach(auto const &entry, priorityRegister)