From f97ed339ad80df508e62eaa4b9ad2fba64dcd67f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 26 Sep 2017 23:16:26 +0200 Subject: [PATCH 01/10] network-setup: fix text-alignment for network-test Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b692d24fda3f5973c4daf7eea172a2f627cc4bb5 Author: vanhofen Date: 2017-09-26 (Tue, 26 Sep 2017) Origin message was: ------------------ - network-setup: fix text-alignment for network-test ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 83ff99e01..d619b90da 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -817,7 +817,7 @@ void CNetworkSetup::testNetworkSettings() } } - ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack); // UTF-8 + ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NULL, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); // UTF-8 } int CNetworkSetup::showWlanList() From cca97df195bfc9c39967c894c6127d1884aa0654 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:32:42 +0200 Subject: [PATCH 02/10] network-setup: add header-icon to network-test Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/30b1c76aadf90f0f51cd814c0df4598d83fa6762 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - network-setup: add header-icon to network-test ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index d619b90da..cea5053fd 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -817,7 +817,7 @@ void CNetworkSetup::testNetworkSettings() } } - ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NULL, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); // UTF-8 + ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_NETWORK, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); } int CNetworkSetup::showWlanList() From fced13d10f0c33de8aafe17201f093f7366451b4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:33:15 +0200 Subject: [PATCH 03/10] bouqueteditor: fix timeout; editor doesn't open when timeout was "off" Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/798661b006d216fb7683217943319ad7e543ba9c Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - bouqueteditor: fix timeout; editor doesn't open when timeout was "off" ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_bouquets.cpp | 4 ++-- src/gui/bedit/bouqueteditor_channels.cpp | 4 ++-- src/gui/bedit/bouqueteditor_chanselect.cpp | 4 ++-- src/gui/bedit/bouqueteditor_globals.cpp | 2 ++ src/gui/bedit/bouqueteditor_globals.h | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index b59d8f92c..90ce43767 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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index e84997f94..5bb25a86f 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -312,7 +312,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* channelsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) @@ -320,7 +320,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 66d0cd3a1..11bba6fb6 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -315,7 +315,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti paintFoot(); paintItems(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); channelChanged = false; bool loop = true; @@ -324,7 +324,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) { diff --git a/src/gui/bedit/bouqueteditor_globals.cpp b/src/gui/bedit/bouqueteditor_globals.cpp index f164d7e59..62f51c1d9 100644 --- a/src/gui/bedit/bouqueteditor_globals.cpp +++ b/src/gui/bedit/bouqueteditor_globals.cpp @@ -53,6 +53,8 @@ CBEGlobals::CBEGlobals() x = getScreenStartX(width); y = getScreenStartY(height); + + timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; } CBEGlobals::~CBEGlobals() diff --git a/src/gui/bedit/bouqueteditor_globals.h b/src/gui/bedit/bouqueteditor_globals.h index 49e84cbd5..ea02ea8d1 100644 --- a/src/gui/bedit/bouqueteditor_globals.h +++ b/src/gui/bedit/bouqueteditor_globals.h @@ -56,6 +56,8 @@ class CBEGlobals int action_icon_width; int status_icon_width; + + int timeout; }; #endif From 2bcb920dae575ca2874904e68a0a019f5cdfc4e7 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:53:13 +0200 Subject: [PATCH 04/10] fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5b8f7b86bf3fd8141924fed6a0346860fdde5fd7 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 5 +++-- src/gui/epgview.cpp | 18 ++++++++++-------- src/gui/eventlist.cpp | 17 +++++++++-------- src/gui/filebrowser.cpp | 10 ++++++---- 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index d1f6b3d5d..b871f87b5 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -934,14 +934,15 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque this->paint(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 1d759cc2d..32c088749 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -938,13 +938,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start bool loop = true; bool epgTextSwitchClear = true; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); while (loop) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); scrollCount = medlinecount; @@ -1095,7 +1097,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else { printf("no network devices available\n"); @@ -1126,7 +1128,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (doRecord) { @@ -1147,11 +1149,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } else { ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -1216,7 +1218,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start imdb->getIMDb(epgData.title); showIMDb(); showTimerEventBar(true, !mp_info && isCurrentEPG(channel_id), mp_info); //show buttons - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (imdb_active && imdb->gotPoster()) { @@ -1271,7 +1273,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else printf("timerd not available\n"); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 6881d579a..a6e7e3778 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -378,7 +378,8 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna int oldselected = selected; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) @@ -386,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if(fader.FadeDone()) @@ -492,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else { @@ -529,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } timerlist.clear(); g_Timerd->getTimerList (timerlist); @@ -559,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { @@ -609,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (msg == CRCInput::RC_epg) { @@ -652,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -662,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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 9a49f973b..772ca307d 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -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)) { From fe5d653cfca29997bae52908d4c3551d0d655c17 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 09:13:07 +0200 Subject: [PATCH 05/10] fix some timout-off-bugs in bouquetlist and channellist Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5405ea7aee3e0682d800fec29b81e21c0d90bb8f Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - fix some timout-off-bugs in bouquetlist and channellist ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bouquetlist.cpp | 5 +++-- src/gui/channellist.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index f5546de02..5e74db9d8 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -463,14 +463,15 @@ int CBouquetList::show(bool bShowChannelList) unsigned int chn= 0; int pos= lmaxpos; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop=true; while (loop) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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 617007292..4f4833a68 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -617,14 +617,15 @@ int CChannelList::show() int zapOnExit = false; bool bShowBouquetList = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool empty = (*chanlist).empty(); if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { @@ -698,7 +699,7 @@ int CChannelList::show() loop = false; } else { paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -733,7 +734,7 @@ int CChannelList::show() else { if (ret != 0) paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) { From f72b23a71bf4ab2228e1a6029c2af603979f256a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 26 Sep 2017 23:16:26 +0200 Subject: [PATCH 06/10] network-setup: fix text-alignment for network-test Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/b37deab766b367370cab1434c5fb9b5683fc6773 Author: vanhofen Date: 2017-09-26 (Tue, 26 Sep 2017) Origin message was: ------------------ - network-setup: fix text-alignment for network-test ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 05eb80617..70ba1403c 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -787,7 +787,7 @@ void CNetworkSetup::testNetworkSettings() } } - ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack); // UTF-8 + ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NULL, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); // UTF-8 } int CNetworkSetup::showWlanList() From 2c4ee6e4845d1c5a80c8ec8bc8ad108ba52152b4 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:32:42 +0200 Subject: [PATCH 07/10] network-setup: add header-icon to network-test Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/db5af2d9caa573cc30b0906431e67690a16a1919 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - network-setup: add header-icon to network-test ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/network_setup.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 70ba1403c..45d19a739 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -787,7 +787,7 @@ void CNetworkSetup::testNetworkSettings() } } - ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NULL, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); // UTF-8 + ShowMsg(LOCALE_NETWORKMENU_TEST, text, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_NETWORK, MSGBOX_MIN_WIDTH, NO_TIMEOUT, false, CMsgBox::AUTO_WIDTH | CMsgBox::AUTO_HIGH); } int CNetworkSetup::showWlanList() From 7d0a8b9698f003426105bfcdb443cb7518fb3ed1 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:33:15 +0200 Subject: [PATCH 08/10] bouqueteditor: fix timeout; editor doesn't open when timeout was "off" Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/db80514499e36def7221f646b97f4899d7788392 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - bouqueteditor: fix timeout; editor doesn't open when timeout was "off" ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bedit/bouqueteditor_bouquets.cpp | 4 ++-- src/gui/bedit/bouqueteditor_channels.cpp | 4 ++-- src/gui/bedit/bouqueteditor_chanselect.cpp | 4 ++-- src/gui/bedit/bouqueteditor_globals.cpp | 2 ++ src/gui/bedit/bouqueteditor_globals.h | 2 ++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/gui/bedit/bouqueteditor_bouquets.cpp b/src/gui/bedit/bouqueteditor_bouquets.cpp index b59d8f92c..90ce43767 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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { diff --git a/src/gui/bedit/bouqueteditor_channels.cpp b/src/gui/bedit/bouqueteditor_channels.cpp index e84997f94..5bb25a86f 100644 --- a/src/gui/bedit/bouqueteditor_channels.cpp +++ b/src/gui/bedit/bouqueteditor_channels.cpp @@ -312,7 +312,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* channelsChanged = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) @@ -320,7 +320,7 @@ int CBEChannelWidget::exec(CMenuTarget* parent, const std::string & /*actionKey* g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == CRCInput::RC_timeout) || (msg == (neutrino_msg_t)g_settings.key_channelList_cancel)) { diff --git a/src/gui/bedit/bouqueteditor_chanselect.cpp b/src/gui/bedit/bouqueteditor_chanselect.cpp index 66d0cd3a1..11bba6fb6 100644 --- a/src/gui/bedit/bouqueteditor_chanselect.cpp +++ b/src/gui/bedit/bouqueteditor_chanselect.cpp @@ -315,7 +315,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti paintFoot(); paintItems(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); channelChanged = false; bool loop = true; @@ -324,7 +324,7 @@ int CBEChannelSelectWidget::exec(CMenuTarget* parent, const std::string & /*acti g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == (neutrino_msg_t)g_settings.key_channelList_cancel) || (msg == CRCInput::RC_home)) { diff --git a/src/gui/bedit/bouqueteditor_globals.cpp b/src/gui/bedit/bouqueteditor_globals.cpp index f164d7e59..62f51c1d9 100644 --- a/src/gui/bedit/bouqueteditor_globals.cpp +++ b/src/gui/bedit/bouqueteditor_globals.cpp @@ -53,6 +53,8 @@ CBEGlobals::CBEGlobals() x = getScreenStartX(width); y = getScreenStartY(height); + + timeout = g_settings.timing[SNeutrinoSettings::TIMING_MENU]; } CBEGlobals::~CBEGlobals() diff --git a/src/gui/bedit/bouqueteditor_globals.h b/src/gui/bedit/bouqueteditor_globals.h index 49e84cbd5..ea02ea8d1 100644 --- a/src/gui/bedit/bouqueteditor_globals.h +++ b/src/gui/bedit/bouqueteditor_globals.h @@ -56,6 +56,8 @@ class CBEGlobals int action_icon_width; int status_icon_width; + + int timeout; }; #endif From a33872ac9ce3e2212a77b7ce29c184bb97e19686 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 08:53:13 +0200 Subject: [PATCH 09/10] fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f0e7069878098b0ab346f6bc0f53f3d7bd56c004 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/epgplus.cpp | 5 +++-- src/gui/epgview.cpp | 16 +++++++++------- src/gui/eventlist.cpp | 17 +++++++++-------- src/gui/filebrowser.cpp | 10 ++++++---- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/gui/epgplus.cpp b/src/gui/epgplus.cpp index 9bdc9c69b..c77b79eee 100644 --- a/src/gui/epgplus.cpp +++ b/src/gui/epgplus.cpp @@ -934,14 +934,15 @@ int EpgPlus::exec(CChannelList * pchannelList, int selectedChannelIndex, CBouque this->paint(); - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) { g_RCInput->getMsgAbsoluteTimeout(&msg, &data, &timeoutEnd); if (msg <= CRCInput::RC_MaxRC) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 2cab74547..5b5919d0d 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -895,13 +895,15 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start bool loop = true; bool epgTextSwitchClear = true; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); while (loop) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); scrollCount = medlinecount; @@ -1044,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else { printf("no network devices available\n"); @@ -1075,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (doRecord) { @@ -1096,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } else { ShowMsg(LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTRECORD_MSG, CMsgBox::mbrBack, CMsgBox::mbBack, NEUTRINO_ICON_INFO); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -1160,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else printf("timerd not available\n"); diff --git a/src/gui/eventlist.cpp b/src/gui/eventlist.cpp index 7f17c199d..48ee970a5 100644 --- a/src/gui/eventlist.cpp +++ b/src/gui/eventlist.cpp @@ -378,7 +378,8 @@ int CEventList::exec(const t_channel_id channel_id, const std::string& channelna int oldselected = selected; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_EPG]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop = true; while (loop) @@ -386,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { if(fader.FadeDone()) @@ -492,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else { @@ -529,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } timerlist.clear(); g_Timerd->getTimerList (timerlist); @@ -559,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (msg == (neutrino_msg_t)g_settings.key_channelList_cancel) { @@ -609,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } else if (msg == CRCInput::RC_epg) { @@ -652,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -662,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(g_settings.timing[SNeutrinoSettings::TIMING_EPG]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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 9a49f973b..772ca307d 100644 --- a/src/gui/filebrowser.cpp +++ b/src/gui/filebrowser.cpp @@ -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)) { From 219ae6b8d41d087c1ab0cca4b1fd7b6d2fa72e83 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 27 Sep 2017 09:13:07 +0200 Subject: [PATCH 10/10] fix some timout-off-bugs in bouquetlist and channellist Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/95157b1f8f285d40bab97490cff38901c5dfbfa7 Author: vanhofen Date: 2017-09-27 (Wed, 27 Sep 2017) Origin message was: ------------------ - fix some timout-off-bugs in bouquetlist and channellist ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/bouquetlist.cpp | 5 +++-- src/gui/channellist.cpp | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/gui/bouquetlist.cpp b/src/gui/bouquetlist.cpp index d031f4bc8..dec1dd048 100644 --- a/src/gui/bouquetlist.cpp +++ b/src/gui/bouquetlist.cpp @@ -459,14 +459,15 @@ int CBouquetList::show(bool bShowChannelList) unsigned int chn= 0; int pos= lmaxpos; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool loop=true; while (loop) { g_RCInput->getMsgAbsoluteTimeout( &msg, &data, &timeoutEnd ); if ( msg <= CRCInput::RC_MaxRC ) - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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 f3d9cca38..4ce445fea 100644 --- a/src/gui/channellist.cpp +++ b/src/gui/channellist.cpp @@ -613,14 +613,15 @@ int CChannelList::show() int zapOnExit = false; bool bShowBouquetList = false; - uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + int timeout = g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]; + uint64_t timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : 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(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); bool empty = (*chanlist).empty(); if((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) { @@ -694,7 +695,7 @@ int CChannelList::show() loop = false; } else { paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } } @@ -729,7 +730,7 @@ int CChannelList::show() else { if (ret != 0) paint(); - timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_CHANLIST]); + timeoutEnd = CRCInput::calcTimeoutEnd(timeout == 0 ? 0xFFFF : timeout); } } else if (!empty && msg == (neutrino_msg_t) g_settings.key_list_start) {