mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fix some timout-off-bugs in bouquetlist and channellist

Browse Source
This commit is contained in:
svenhoefer
2017-09-27 09:13:07 +02:00
committed by Jacek Jendrzej
parent f0e7069878
commit 95157b1f8f
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/bouquetlist.cpp
View File

@@ -459,14 +459,15 @@ int CBouquetList::show(bool bShowChannelList)
unsigned int chn= 0; unsigned int chn= 0;
int pos= lmaxpos; int pos= lmaxpos;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop=true; bool loop=true;
while (loop) { while (loop) {
g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd );
if ( msg <= CRCInput::RC_MaxRC ) if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
if(fader.FadeDone()) if(fader.FadeDone())

9
src/gui/channellist.cpp
View File

@@ -613,14 +613,15 @@ int CChannelList::show()
int zapOnExit = false; int zapOnExit = false;
bool bShowBouquetList = false; bool bShowBouquetList = false;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop=true; bool loop=true;
bool dont_hide = false; bool dont_hide = false;
while (loop) { while (loop) {
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true);
if ( msg <= CRCInput::RC_MaxRC ) if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool empty = (*chanlist).empty(); bool empty = (*chanlist).empty();
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
@@ -694,7 +695,7 @@ int CChannelList::show()
loop = false; loop = false;
} else { } else {
paint(); paint();
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
} }
} }
} }
@@ -729,7 +730,7 @@ int CChannelList::show()
else { else {
if (ret != 0) if (ret != 0)
paint(); paint();
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
} }
} }
else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) { else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) {