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

Amlogic box uses aml and fb buffer (#141)

Browse Source 
* v4l: fix auto mode opens usable device twice

* on amlogic system, start framegrabber and amlogic grabber

* tune code formating

* make aml grabber always one prio below fb

* hyperiond refactoring

* refactor hyperiond grabber donfig code
add json clinet view of active and inactive input sources
This commit is contained in:
redPanther
2016-07-27 22:52:59 +02:00
committed by GitHub
parent b7d1fbf378
commit f1a4672a93
4 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsrc/jsonserver/JsonClientConnection.cpp
View File

@@ -387,7 +387,8 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
Json::Value & priorities = info["priorities"] = Json::Value(Json::arrayValue);
uint64_t now = QDateTime::currentMSecsSinceEpoch();
QList<int> activePriorities = _hyperion->getActivePriorities();
const Hyperion::PriorityRegister& priorityRegister = _hyperion->getPriorityRegister();
Hyperion::PriorityRegister priorityRegister = _hyperion->getPriorityRegister();
foreach (int priority, activePriorities) {
const Hyperion::InputInfo & priorityInfo = _hyperion->getPriorityInfo(priority);
Json::Value & item = priorities[priorities.size()];
@@ -398,15 +399,24 @@ void JsonClientConnection::handleServerInfoCommand(const Json::Value &)
}
item["owner"] = "unknown";
for(auto const &entry : priorityRegister)
item["active"] = "true";
foreach(auto const &entry, priorityRegister)
{
if (entry.second == priority)
{
item["owner"] = entry.first;
priorityRegister.erase(entry.first);
break;
}
}
}
foreach(auto const &entry, priorityRegister)
{
Json::Value & item = priorities[priorities.size()];
item["priority"] = entry.second;
item["active"] = "false";
item["owner"] = entry.first;
}
// collect temperature correction information
Json::Value & temperatureArray = info["temperature"];