- 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

@@ -638,7 +638,7 @@ bool CFileBrowser::exec(const char * const dirname)
unsigned int oldselected = selected;
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
bool loop=true;
while (loop)
@@ -647,7 +647,7 @@ bool CFileBrowser::exec(const char * const dirname)
neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat;
if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
if(!CRCInput::isNumeric(msg))
{
@@ -949,7 +949,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
paintFoot();
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
bool loop=true;
while (loop)
@@ -959,7 +959,7 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
neutrino_msg_t msg_repeatok = msg & ~CRCInput::RC_Repeat;
if (msg <= CRCInput::RC_MaxRC)
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout);
if(!CRCInput::isNumeric(msg))
{