From 20451a9be679b8465c6f8b93070503f99279445e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 29 Sep 2017 08:27:42 +0200 Subject: [PATCH 1/3] rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/99cc7f850a781d01312654250a19dd091602d73f Author: vanhofen Date: 2017-09-29 (Fri, 29 Sep 2017) Origin message was: ------------------ - rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now --- src/driver/rcinput.cpp | 13 +++++++------ src/driver/volume.cpp | 4 ++-- src/gui/bedit/bouqueteditor_bouquets.cpp | 6 +++--- src/gui/bedit/bouqueteditor_channels.cpp | 6 +++--- src/gui/bedit/bouqueteditor_chanselect.cpp | 4 ++-- src/gui/bookmarkmanager.cpp | 4 ++-- src/gui/bouquetlist.cpp | 4 ++-- src/gui/channellist.cpp | 10 +++++----- src/gui/dboxinfo.cpp | 7 +++---- src/gui/epgplus.cpp | 6 +++--- src/gui/epgview.cpp | 18 +++++++++--------- src/gui/eventlist.cpp | 20 ++++++++++---------- src/gui/filebrowser.cpp | 8 ++++---- src/gui/hdd_menu.cpp | 2 +- src/gui/infoviewer.cpp | 16 +++++++--------- src/gui/lua/lua_hintbox.cpp | 2 +- src/gui/osd_setup.cpp | 4 ++-- src/gui/pipsetup.cpp | 4 ++-- src/gui/screensetup.cpp | 6 ++---- src/gui/timerlist.cpp | 6 +++--- src/gui/widget/colorchooser.cpp | 4 ++-- src/gui/widget/hintbox.cpp | 2 +- src/gui/widget/keyboard_input.cpp | 6 +++--- src/gui/widget/menue.cpp | 8 ++++---- src/gui/widget/shellwindow.cpp | 2 +- src/gui/widget/stringinput.cpp | 6 +++--- src/gui/widget/stringinput_ext.cpp | 4 ++-- 27 files changed, 89 insertions(+), 93 deletions(-) diff --git a/src/driver/rcinput.cpp b/src/driver/rcinput.cpp index 3648df7a7..4552688e6 100644 --- a/src/driver/rcinput.cpp +++ b/src/driver/rcinput.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -405,7 +406,7 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout ) if ( timeout == -1 ) timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); while (doLoop) { @@ -435,7 +436,7 @@ int CRCInput::messageLoop( bool anyKeyCancels, int timeout ) if ( anyKeyCancels ) doLoop = false; else - timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } } @@ -535,15 +536,15 @@ int CRCInput::checkTimers() return _id; } -int64_t CRCInput::calcTimeoutEnd(const int timeout_in_seconds) +int64_t CRCInput::calcTimeoutEnd(const int _timeout_in_seconds) { - return time_monotonic_us() + ((uint64_t)timeout_in_seconds * (uint64_t) 1000000); + uint64_t timeout_in_seconds = (_timeout_in_seconds == 0) ? INT_MAX : _timeout_in_seconds; + return time_monotonic_us() + (timeout_in_seconds * 1000000); } int64_t CRCInput::calcTimeoutEnd_MS(const int timeout_in_milliseconds) { - uint64_t timeNow = time_monotonic_us(); - return ( timeNow + timeout_in_milliseconds * 1000 ); + return time_monotonic_us() + (timeout_in_milliseconds * 1000); } void CRCInput::getMsgAbsoluteTimeout(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint64_t *TimeoutEnd, bool bAllowRepeatLR) diff --git a/src/driver/volume.cpp b/src/driver/volume.cpp index 9b66449fd..d0706fc1b 100644 --- a/src/driver/volume.cpp +++ b/src/driver/volume.cpp @@ -146,10 +146,10 @@ void CVolume::setVolume(const neutrino_msg_t key) } setvol(g_settings.current_volume); - timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]); } else if (msg == NeutrinoMessages::EVT_VOLCHANGED) { - timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_VOLUMEBAR]); } else if (CNeutrinoApp::getInstance()->handleMsg(msg, data) & messages_return::unhandled) { g_RCInput->postMsg(msg, data); diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index b431d3680..69ee284ab 100644 --- a/src/gui/bedit/bouqueteditor_bouquets.cpp +++ b/src/gui/bedit/bouqueteditor_bouquets.cpp @@ -221,7 +221,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* bouquetsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool loop = true; while (loop) @@ -229,7 +229,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { @@ -364,7 +364,7 @@ int CBEBouquetWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* paintFoot(); paintItems(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } else if (state == beMoving) diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index e6b0548ed..ac5a260cd 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -317,7 +317,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* channelsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool loop = true; while (loop) @@ -325,7 +325,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { @@ -362,7 +362,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* if (state == beDefault) addChannel(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } else if (msg == CRCInput::RC_yellow) { diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 39cfacc24..09766df53 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -318,7 +318,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti paintFoot(); paintItems(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); channelChanged = false; bool loop = true; @@ -327,7 +327,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) { diff --git a/src/gui/bookmarkmanager.cpp b/src/gui/bookmarkmanager.cpp index 383ee2555..25a4ab6d1 100644 --- a/src/gui/bookmarkmanager.cpp +++ b/src/gui/bookmarkmanager.cpp @@ -251,7 +251,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent) int res = -1; - 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]); uint32_t msg; uint32_t data; @@ -268,7 +268,7 @@ const CBookmark * CBookmarkManager::getBookmark(CMenuTarget* parent) g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); 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 == CRCInput::RC_timeout ) || ( msg == CRCInput::RC_home) ) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index dec1dd048..31da55950 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -460,14 +460,14 @@ int CBouquetList::show(bool bShowChannelList) int pos= lmaxpos; int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool loop=true; while (loop) { 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()) diff --git a/src/gui/channellist.cpp b/src/gui/channellist.cpp index 4ce445fea..2d25fbcff 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -614,14 +614,14 @@ int CChannelList::show() bool bShowBouquetList = false; int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool loop=true; bool dont_hide = false; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool empty = (*chanlist).empty(); if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { @@ -643,7 +643,7 @@ int CChannelList::show() selected = selected_in_new_mode; } if(fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; } else loop=false; @@ -695,7 +695,7 @@ int CChannelList::show() loop = false; } else { paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } } @@ -730,7 +730,7 @@ int CChannelList::show() else { if (ret != 0) paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) { diff --git a/src/gui/dboxinfo.cpp b/src/gui/dboxinfo.cpp index 403220faf..78f8c80ea 100644 --- a/src/gui/dboxinfo.cpp +++ b/src/gui/dboxinfo.cpp @@ -110,8 +110,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) bool doLoop = true; int timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; - - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); uint32_t updateTimer = g_RCInput->addTimer(5*1000*1000, false); while (doLoop) @@ -129,7 +128,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) ( msg == CRCInput::RC_home ) || ( msg == CRCInput::RC_ok ) ) { if(fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; } else doLoop = false; @@ -157,7 +156,7 @@ int CDBoxInfoWidget::exec(CMenuTarget* parent, const std::string &) if ((msg <= CRCInput::RC_MaxRC) && (data == 0)) /* <- button pressed */ { - timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } } diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index c77b79eee..368444d85 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -935,14 +935,14 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque this->paint(); int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); bool loop = true; while (loop) { 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())) @@ -954,7 +954,7 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque { if (fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; } else diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 5b5919d0d..240f0087a 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -897,13 +897,13 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start bool epgTextSwitchClear = true; int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); while (loop) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); scrollCount = medlinecount; @@ -1046,7 +1046,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start bigFonts = g_settings.bigFonts; show(channel_id,epgData.eventID,&epgData.epg_times.startzeit,false); showPos=0; - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } else { printf("no network devices available\n"); @@ -1077,7 +1077,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start epgData.epg_times.startzeit + epgData.epg_times.dauer, epgData.title, epgData.eventID, TIMERD_APIDS_CONF, true, recDir, &evtlist); m.exec(NULL, ""); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } else if (doRecord) { @@ -1098,11 +1098,11 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start epgData.epg_times.startzeit - (ANNOUNCETIME + 120 ), TIMERD_APIDS_CONF, true, epgData.epg_times.startzeit - (ANNOUNCETIME + 120) > time(NULL), recDir, true); ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } else { ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } } } @@ -1162,7 +1162,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start epgData.eventID, epgData.epg_times.startzeit, 0); ShowMsg(LOCALE_TIMER_EVENTTIMED_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); - timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout); } else printf("timerd not available\n"); @@ -1220,7 +1220,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start case CRCInput::RC_ok: case CRCInput::RC_timeout: if(fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; } else loop = false; @@ -1228,7 +1228,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start default: if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { if(fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; } else loop = false; diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 48ee970a5..97d9a5bc4 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -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); diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp index 772ca307d..05519d4cb 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -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)) { diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp index 11d2831d0..fba3e6ef0 100644 --- a/src/gui/hdd_menu.cpp +++ b/src/gui/hdd_menu.cpp @@ -1085,7 +1085,7 @@ int CHDDMenuHandler::checkDevice(std::string dev) progress->showGlobalStatus(100); progress->showStatusMessageUTF(buf); - 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]); loop = true; while (loop) { diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index 72f4298ce..0420e50dd 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -924,18 +924,16 @@ void CInfoViewer::setInfobarTimeout(int timeout_ext) //define timeouts switch (mode) { - case NeutrinoMessages::mode_tv: - case NeutrinoMessages::mode_webtv: - timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); - break; case NeutrinoMessages::mode_radio: - timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_RADIO] + timeout_ext); break; case NeutrinoMessages::mode_ts: - timeoutEnd = CRCInput::calcTimeoutEnd (g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR_MOVIE] + timeout_ext); break; + case NeutrinoMessages::mode_tv: + case NeutrinoMessages::mode_webtv: default: - timeoutEnd = CRCInput::calcTimeoutEnd(6 + timeout_ext); + timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR] + timeout_ext); break; } } @@ -1063,7 +1061,7 @@ void CInfoViewer::loop(bool show_dot) } } if(fader.StartFadeOut()) - timeoutEnd = CRCInput::calcTimeoutEnd (1); + timeoutEnd = CRCInput::calcTimeoutEnd(1); else res = messages_return::cancel_info; } else if ((g_settings.mode_left_right_key_tv == SNeutrinoSettings::VZAP) && ((msg == CRCInput::RC_right) || (msg == CRCInput::RC_left ))) { @@ -1260,7 +1258,7 @@ void CInfoViewer::showSubchan () } else g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_INFO]->RenderString (x + 10, y + dy - 2, dx - 20, text, COL_MENUCONTENT_TEXT); - uint64_t timeoutEnd_tmp = CRCInput::calcTimeoutEnd (2); + uint64_t timeoutEnd_tmp = CRCInput::calcTimeoutEnd(2); int res = messages_return::none; neutrino_msg_t msg; diff --git a/src/gui/lua/lua_hintbox.cpp b/src/gui/lua/lua_hintbox.cpp index eec52f441..f7609ab4d 100644 --- a/src/gui/lua/lua_hintbox.cpp +++ b/src/gui/lua/lua_hintbox.cpp @@ -138,7 +138,7 @@ int CLuaInstHintbox::HintboxExec(lua_State *L) timeout = 5; /// default timeout 5 sec //timeout = g_settings.timing[SNeutrinoSettings::TIMING_INFOBAR]; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); int res = messages_return::none; diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 4d4cbaf32..b3821636f 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -303,14 +303,14 @@ int COsdSetup::exec(CMenuTarget* parent, const std::string &actionKey) paintWindowSize(old_window_width, old_window_height); - 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; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); 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 == CRCInput::RC_ok ) { memset(window_size_value, 0, sizeof(window_size_value)); diff --git a/src/gui/pipsetup.cpp b/src/gui/pipsetup.cpp index d6120cec2..32365e019 100644 --- a/src/gui/pipsetup.cpp +++ b/src/gui/pipsetup.cpp @@ -121,14 +121,14 @@ int CPipSetup::exec(CMenuTarget* parent, const std::string &) paint(); - 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; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); 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 == (neutrino_msg_t) g_settings.key_pip_setup) || (msg == CRCInput::RC_timeout) || (msg == CRCInput::RC_ok)) { diff --git a/src/gui/screensetup.cpp b/src/gui/screensetup.cpp index 5c1e29647..2ffd55c76 100644 --- a/src/gui/screensetup.cpp +++ b/src/gui/screensetup.cpp @@ -96,8 +96,7 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) selected = 0; - 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; while (loop) @@ -105,8 +104,7 @@ int CScreenSetup::exec(CMenuTarget* parent, const std::string &) g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd, true ); 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]); switch ( msg ) { diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 4d2baf318..f217679a1 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -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 diff --git a/src/gui/widget/colorchooser.cpp b/src/gui/widget/colorchooser.cpp index 9cee6d6f9..9253752cb 100644 --- a/src/gui/widget/colorchooser.cpp +++ b/src/gui/widget/colorchooser.cpp @@ -151,14 +151,14 @@ int CColorChooser::exec(CMenuTarget* parent, const std::string &) int selected = 0; - 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; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); 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]); int val = (*value[selected]); switch ( msg ) { diff --git a/src/gui/widget/hintbox.cpp b/src/gui/widget/hintbox.cpp index c08b31be5..ec9cd854e 100644 --- a/src/gui/widget/hintbox.cpp +++ b/src/gui/widget/hintbox.cpp @@ -208,7 +208,7 @@ int CHintBox::exec() if (timeout == NO_TIMEOUT || timeout == DEFAULT_TIMEOUT) timeout = HINTBOX_DEFAULT_TIMEOUT; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd( timeout ); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout); if (timeout > 0) enableTimeOutBar(); diff --git a/src/gui/widget/keyboard_input.cpp b/src/gui/widget/keyboard_input.cpp index 7e910d618..bcc80d5f0 100644 --- a/src/gui/widget/keyboard_input.cpp +++ b/src/gui/widget/keyboard_input.cpp @@ -567,7 +567,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) paint(); paintKeyboard(); - 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; while (loop) @@ -580,7 +580,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true); 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==CRCInput::RC_left) { @@ -635,7 +635,7 @@ int CKeyboardInput::exec(CMenuTarget* parent, const std::string &) { if ((inputString->getValue() != oldval) && (ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { - 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]); continue; } diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index 943541713..2a516a62a 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -778,7 +778,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) int pos = selected; int retval = 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 bAllowRepeatLR_override = keyActionMap.find(CRCInput::RC_left) != keyActionMap.end() || keyActionMap.find(CRCInput::RC_right) != keyActionMap.end(); do { @@ -790,7 +790,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) int handled= false; 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]); std::map::iterator it = keyActionMap.find(msg); if (it != keyActionMap.end()) { @@ -1006,7 +1006,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) } if(msg == CRCInput::RC_timeout) { if(fade && fader.StartFadeOut()) { - timeoutEnd = CRCInput::calcTimeoutEnd( 1 ); + timeoutEnd = CRCInput::calcTimeoutEnd(1); msg = 0; continue; } @@ -1015,7 +1015,7 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) if ( msg <= CRCInput::RC_MaxRC ) { // recalculate timeout for RC-keys - 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]); } frameBuffer->blit(); } diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp index f2b641f5a..60af07803 100644 --- a/src/gui/widget/shellwindow.cpp +++ b/src/gui/widget/shellwindow.cpp @@ -283,7 +283,7 @@ void CShellWindow::showResult() neutrino_msg_t msg; neutrino_msg_data_t data; - 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]); if (!exit) { diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp index a0c789a86..b4b8a30c8 100644 --- a/src/gui/widget/stringinput.cpp +++ b/src/gui/widget/stringinput.cpp @@ -407,7 +407,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) paint(); - 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; while (loop) @@ -422,7 +422,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd, true ); 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 == smstimer)) msg = CRCInput::RC_right; @@ -493,7 +493,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & ) string tmp_name = name == NONEXISTANT_LOCALE ? head : g_Locale->getText(name); if ((trim (*valueString) != trim(oldval)) && (ShowMsg(tmp_name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) { - 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]); continue; } diff --git a/src/gui/widget/stringinput_ext.cpp b/src/gui/widget/stringinput_ext.cpp index 0de0282d9..aa11a805f 100644 --- a/src/gui/widget/stringinput_ext.cpp +++ b/src/gui/widget/stringinput_ext.cpp @@ -187,7 +187,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & ) paint(); frameBuffer->blit(); - 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; while (loop) @@ -281,7 +281,7 @@ int CExtendedInput::exec( CMenuTarget* parent, const std::string & ) *cancel = false; } else if(erg==CMsgBox::mbrCancel){ - 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]); } } else { loop=false; From b4363c5dc479962d88d6d9fda012e3a80dd651ba Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sat, 30 Sep 2017 08:10:56 +0200 Subject: [PATCH 2/3] Revert "Revert "CMenuWidget: simplify menu_left_exit code, add missing break"" This reverts the revert commit ab4decf40e033ce05994d5e5cf14304e113f5cd2. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/39d31166c978e932e1dc2a36db08b0b2f3ae32f1 Author: vanhofen Date: 2017-09-30 (Sat, 30 Sep 2017) --- src/gui/widget/menue.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index a6feeac7a..aa25bac16 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -949,16 +949,12 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; } case (CRCInput::RC_left): - { - if(hasItem() && selected > -1 && (int)items.size() > selected) { - CMenuItem* itemX = items[selected]; - if (!itemX->isMenueOptionChooser()) { - if (g_settings.menu_left_exit) - msg = CRCInput::RC_timeout; - break; - } - } + if (hasItem() && selected > -1 && (int)items.size() > selected) { + CMenuItem* itemX = items[selected]; + if (!itemX->isMenueOptionChooser() && g_settings.menu_left_exit) + msg = CRCInput::RC_timeout; } + break; case (CRCInput::RC_right): case (CRCInput::RC_ok): { From 57e71ff6254240d6bff63436605dd2895be8b429 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Fri, 29 Sep 2017 20:37:37 +0200 Subject: [PATCH 3/3] CMenuWidget: fix "left" key for menuchoosers where the "decrement menu function" got lost by the last "simplify code and add missing break" commit. The implicit fallthrough actually was used to execute the "left" function. Reorganize the code so that it works even without the implicit fallthrough. Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/fea586b31116e0c1630e2232e30e2ad9269f2e5a Author: Stefan Seyfried Date: 2017-09-29 (Fri, 29 Sep 2017) --- src/gui/widget/menue.cpp | 77 +++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index aa25bac16..31711bea6 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -949,50 +949,47 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; } case (CRCInput::RC_left): - if (hasItem() && selected > -1 && (int)items.size() > selected) { - CMenuItem* itemX = items[selected]; - if (!itemX->isMenueOptionChooser() && g_settings.menu_left_exit) - msg = CRCInput::RC_timeout; - } - break; case (CRCInput::RC_right): case (CRCInput::RC_ok): - { - if(hasItem() && selected > -1 && (int)items.size() > selected) { - //NI lcd4l-support - LCD4l->RemoveFile("/tmp/lcd/menu"); + if (hasItem() && selected > -1 && (int)items.size() > selected) { + //NI lcd4l-support + LCD4l->RemoveFile("/tmp/lcd/menu"); - //exec this item... - CMenuItem* item = items[selected]; - if (!item->isSelectable()) - break; - item->msg = msg; - fader.StopFade(); - int rv = item->exec( this ); - - //NI lcd4l-support - if (g_settings.lcd4l_support) - LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert); - - switch ( rv ) { - case menu_return::RETURN_EXIT_ALL: - retval = menu_return::RETURN_EXIT_ALL; - /* fall through */ - case menu_return::RETURN_EXIT: - msg = CRCInput::RC_timeout; - break; - case menu_return::RETURN_REPAINT: - case menu_return::RETURN_EXIT_REPAINT: - if (fade && washidden) - fader.StartFadeIn(); - checkHints(); - pos = selected; - paint(); - break; - } - } else + //exec this item... + CMenuItem* item = items[selected]; + if (msg == CRCInput::RC_left && g_settings.menu_left_exit && + !item->isMenueOptionChooser()) { msg = CRCInput::RC_timeout; - } + break; + } + if (!item->isSelectable()) + break; + item->msg = msg; + fader.StopFade(); + int rv = item->exec( this ); + + //NI lcd4l-support + if (g_settings.lcd4l_support) + LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert); + + switch ( rv ) { + case menu_return::RETURN_EXIT_ALL: + retval = menu_return::RETURN_EXIT_ALL; + /* fall through */ + case menu_return::RETURN_EXIT: + msg = CRCInput::RC_timeout; + break; + case menu_return::RETURN_REPAINT: + case menu_return::RETURN_EXIT_REPAINT: + if (fade && washidden) + fader.StartFadeIn(); + checkHints(); + pos = selected; + paint(); + break; + } + } else + msg = CRCInput::RC_timeout; break; case (CRCInput::RC_home):