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

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-29 08:27:42 +02:00
parent 97bc00bb1c
commit 369436124b
28 changed files with 93 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/timerlist.cpp
View File

@@ -857,7 +857,7 @@ int CTimerList::show()
int res = menu_return::RETURN_REPAINT;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
bool loop=true;
bool update=true;
@@ -883,7 +883,7 @@ int CTimerList::show()
}
if ( msg <= CRCInput::RC_MaxRC )
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer()))
{
@@ -899,7 +899,7 @@ int CTimerList::show()
{ //Exit after timeout or cancel key
if (fader.StartFadeOut())
{
timeoutEnd = CRCInput::calcTimeoutEnd( 1 );
timeoutEnd = CRCInput::calcTimeoutEnd(1);
msg = 0;
}
else