mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
This commit is contained in:
vanhofen
2017-09-29 08:35:05 +02:00
parent d639455da5 1776ae664d
commit 9351a0bf31
28 changed files with 93 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/epgplus.cpp
View File

@@ -935,14 +935,14 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
this->paint();
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
bool loop = true;
while (loop)
{
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
@@ -954,7 +954,7 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque
{
if (fader.StartFadeOut())
{
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
}
else