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

- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now

Browse Source
This commit is contained in:
svenhoefer
2017-09-29 08:27:42 +02:00
committed by Jacek Jendrzej
parent 386c2b4d09
commit 99cc7f850a
27 changed files with 89 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/eventlist.cpp
View File

@@ -379,7 +379,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
int oldselected = selected;
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
bool loop = true;
while (loop)
@@ -387,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
if(fader.FadeDone())
@@ -397,7 +397,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
{
selected = oldselected;
if(fader.StartFadeOut()) {
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
} else
loop = false;
@@ -493,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else
{
@@ -530,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
timerlist.clear();
g_Timerd->getTimerList (timerlist);
@@ -560,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)
{
@@ -574,7 +574,7 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna
} else {
selected = oldselected;
if(fader.StartFadeOut()) {
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
} else
loop = false;
@@ -610,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else if (msg == CRCInput::RC_epg)
{
@@ -653,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
}
}
@@ -663,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(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
}
else if (CNeutrinoApp::getInstance()->listModeKey(msg)) {
g_RCInput->postMsg (msg, 0);