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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: b718ddff50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
This commit is contained in:
vanhofen
2017-09-27 10:48:51 +02:00
parent 0ac696ebaf fc14107b0b
commit 25804788d3
12 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/filebrowser.cpp
View File

@@ -637,7 +637,8 @@ bool CFileBrowser::exec(const char * const dirname)
unsigned int oldselected = selected;
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop=true;
while (loop)
@@ -646,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(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if(!CRCInput::isNumeric(msg))
{
@@ -947,7 +948,8 @@ bool CFileBrowser::playlist_manager(CFileList &playlist, unsigned int playing)
paint();
paintFoot();
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
int timeout = g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER];
uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
bool loop=true;
while (loop)
@@ -957,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(g_settings.timing[SNeutrinoSettings::TIMING_FILEBROWSER]);
timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout);
if(!CRCInput::isNumeric(msg))
{