From 565ba08c71f395c48a30f4af39145dd4f4b22c20 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 24 Feb 2017 18:26:07 +0100 Subject: [PATCH 1/4] audioplayer: fix small typo Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/eb477aee8efc01d9781c98d1a76f47fe6438c267 Author: vanhofen Date: 2017-02-24 (Fri, 24 Feb 2017) Origin message was: ------------------ - audioplayer: fix small typo ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/audioplayer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp index 151165907..46ab4b8b9 100644 --- a/src/gui/audioplayer.cpp +++ b/src/gui/audioplayer.cpp @@ -1601,7 +1601,7 @@ void CAudioPlayerGui::paintFoot() if (m_screensaver) return; - const struct button_label ScondLineButtons[3] = + const struct button_label SecondLineButtons[3] = { { NEUTRINO_ICON_BUTTON_OKAY , LOCALE_AUDIOPLAYER_PLAY }, { NEUTRINO_ICON_BUTTON_HELP , LOCALE_AUDIOPLAYER_KEYLEVEL }, @@ -1620,7 +1620,7 @@ void CAudioPlayerGui::paintFoot() int bwidth = m_width - (2*c_rad_mid); if (!m_playlist.empty()) - ::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, ScondLineButtons, bwidth, m_buttonHeight); + ::paintButtons(m_x + c_rad_mid, top+m_buttonHeight, bwidth, 3, SecondLineButtons, bwidth, m_buttonHeight); if (m_key_level == 0) { From a8df61b3c1814204148b7bbc9daf221ac075f0e0 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Thu, 23 Feb 2017 22:47:09 +0100 Subject: [PATCH 2/4] neutrino: No terminate moviebrowser, menue, etc. when recording start Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0953e66d22819072237e5480b6e8f7cda62e51be Author: Michael Liebmann Date: 2017-02-23 (Thu, 23 Feb 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/neutrino.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 28d062bd7..e02de17e5 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3181,7 +3181,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) if (rec_mode == CRecordManager::RECMODE_OFF || rec_mode == CRecordManager::RECMODE_TSHIFT) CRecordManager::getInstance()->Record(live_channel_id); delete[] (unsigned char*) data; - return messages_return::handled | messages_return::cancel_all; + return messages_return::handled; } if(mode == mode_standby){ if((eventinfo->channel_id != live_channel_id) && !(SAME_TRANSPONDER(live_channel_id, eventinfo->channel_id))) @@ -3194,7 +3194,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data) } delete[] (unsigned char*) data; - return messages_return::handled | messages_return::cancel_all; + return messages_return::handled; } else if( msg == NeutrinoMessages::RECORD_STOP) { CTimerd::RecordingStopInfo* recinfo = (CTimerd::RecordingStopInfo*)data; From 8a32ff690dfbce4d5e9f04a4bcdbb9028464bb36 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 22 Feb 2017 20:47:12 +0100 Subject: [PATCH 3/4] CComponentsScrollBar: remove unnecessary debug output Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/803253e3d42c074b918891de5fd9920f066ffb3a Author: Thilo Graf Date: 2017-02-22 (Wed, 22 Feb 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_scrollbar.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gui/components/cc_frm_scrollbar.cpp b/src/gui/components/cc_frm_scrollbar.cpp index 529d0102a..2fcfd737c 100644 --- a/src/gui/components/cc_frm_scrollbar.cpp +++ b/src/gui/components/cc_frm_scrollbar.cpp @@ -165,9 +165,6 @@ void CComponentsScrollBar::initSegments() y_seg += h_seg + append_y_offset; int id = sb_segments_obj->getCCItemId(item); - if (sb_mark_id > id){ - dprintf(DEBUG_NORMAL, "[CComponentsScrollBar] %s: sb_mark_id out of range current=%d allowed=%d\n", __func__, sb_mark_id, id); - } //set color for marked id if (sb_mark_id == id){ From bb76d51ddc7acc6af70ff9a54f69809c3565b2f7 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 24 Feb 2017 23:06:35 +0100 Subject: [PATCH 4/4] CVideoSettings: avoid unnecessary display of messageboxes Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/be9dd7938dbdb16e068ff27879be4a203b0b1934 Author: Thilo Graf Date: 2017-02-24 (Fri, 24 Feb 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/videosettings.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp index 6515f171e..9a013a6af 100644 --- a/src/gui/videosettings.cpp +++ b/src/gui/videosettings.cpp @@ -565,6 +565,7 @@ void CVideoSettings::nextMode(void) int curmode = 0; int i; bool disp_cur = 1; + int res = messages_return::none; for (i = 0; i < VIDEOMENU_VIDEOMODE_OPTION_COUNT; i++) { if (VIDEOMENU_VIDEOMODE_OPTIONS[i].key == g_settings.video_Mode) { @@ -576,7 +577,9 @@ void CVideoSettings::nextMode(void) while(1) { CVFD::getInstance()->ShowText(text); - int res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2); + + if (res != messages_return::cancel_info) // avoid unnecessary display of messageboxes, when user is trying to press repeated format button + res = ShowHint(LOCALE_VIDEOMENU_VIDEOMODE, text, 450, 2); if(disp_cur && res != messages_return::handled) break;