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

Websocket auto serverinfo responder (#443)

Browse Source 
* serverinfo cb

* remove webui cron

* missing header file

* tcp connection should trigger to
This commit is contained in:
brindosch
2017-06-17 23:29:04 +02:00
committed by GitHub
parent 91c7637a2b
commit d3707cb118
12 changed files with 166 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libsrc/hyperion/PriorityMuxer.cpp
View File

@@ -1,4 +1,4 @@
#include <iostream>
// STL includes
#include <algorithm>
#include <stdexcept>
@@ -18,6 +18,11 @@ PriorityMuxer::PriorityMuxer(int ledCount)
_lowestPriorityInfo.origin = "System";
_activeInputs[_currentPriority] = _lowestPriorityInfo;
// do a reuqest after blocking timer runs out
connect(&_timer, SIGNAL(timeout()), this, SLOT(emitReq()));
_timer.setSingleShot(true);
_blockTimer.setSingleShot(true);
}
PriorityMuxer::~PriorityMuxer()
@@ -96,9 +101,28 @@ void PriorityMuxer::setCurrentTime(const int64_t& now)
infoIt = _activeInputs.erase(infoIt);
}
else
{
{
_currentPriority = std::min(_currentPriority, infoIt->priority);
// call emitReq when effect or color is running with timeout > -1, blacklist prio 255
if(infoIt->priority < 254 && infoIt->timeoutTime_ms > -1 && (infoIt->componentId == hyperion::COMP_EFFECT || infoIt->componentId == hyperion::COMP_COLOR))
{
emitReq();
}
++infoIt;
}
}
}
void PriorityMuxer::emitReq()
{
if(_blockTimer.isActive())
{
_timer.start(500);
}
else
{
emit timerunner();
_blockTimer.start(1000);
}
}