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

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

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