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

- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser

Browse Source
This commit is contained in:
svenhoefer
2017-09-27 08:53:13 +02:00
committed by Jacek Jendrzej
parent db80514499
commit f0e7069878
4 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/eventlist.cpp
View File

@@ -378,7 +378,8 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
int oldselected = selected;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop = true;
while (loop)
@@ -386,7 +387,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd);
if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
if(fader.FadeDone())
@@ -492,7 +493,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
hide();
recDirs.exec(NULL,"");
paint(evtlist[selected].channelID);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
else
{
@@ -529,7 +530,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
evtlist[selected].startTime + evtlist[selected].duration,
evtlist[selected].description, evtlist[selected].eventID, TIMERD_APIDS_CONF, true, "", &evtlist);
m.exec(NULL, "");
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
timerlist.clear();
g_Timerd->getTimerList (timerlist);
@@ -559,7 +560,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
g_Timerd->getTimerList (timerlist);
paint(evtlist[selected].channelID );
paintFoot(evtlist[selected].channelID );
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)
{
@@ -609,7 +610,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
infozone_background = false;
paint(channel_id);
paintFoot(channel_id);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
else if (msg == CRCInput::RC_epg)
{
@@ -652,7 +653,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
infozone_background = false;
paint(channel_id);
paintFoot(channel_id);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
}
}
@@ -662,7 +663,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
oldEventID = -1;
infozone_background = false;
in_search = findEvents(channel_id, channelname);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
}
else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
g_RCInput->postMsg (msg, 0);