From e0a7eddc60ca2407fffa9f36b8ae3a799d23a556 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 1 Dec 2015 08:17:56 +0100 Subject: [PATCH] moviebrowser: use RC_left/right to switch display modes ... ... to get free volume keys, because these keys should change volume only. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/54e202cea8b4c8029a3f99d5ad3edb386110d04f Author: vanhofen Date: 2015-12-01 (Tue, 01 Dec 2015) Origin message was: ------------------ - moviebrowser: use RC_left/right to switch display modes ... ... to get free volume keys, because these keys should change volume only. ------------------ This commit was generated by Migit --- src/gui/moviebrowser.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index ba72c74cb..1298eaf4f 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1783,11 +1783,11 @@ bool CMovieBrowser::onButtonPressMainFrame(neutrino_msg_t msg) else result = false; } - else if (msg == (neutrino_msg_t)g_settings.key_volumedown) + else if (msg == CRCInput::RC_left) { onSetGUIWindowPrev(); } - else if (msg == (neutrino_msg_t)g_settings.key_volumeup) + else if (msg == CRCInput::RC_right) { onSetGUIWindowNext(); } @@ -2031,9 +2031,9 @@ bool CMovieBrowser::onButtonPressLastPlayList(neutrino_msg_t msg) m_pcLastPlay->scrollLineUp(1); else if (msg == CRCInput::RC_down) m_pcLastPlay->scrollLineDown(1); - else if (msg == CRCInput::RC_left) + else if ((neutrino_msg_t)g_settings.key_pageup) m_pcLastPlay->scrollPageUp(1); - else if (msg == CRCInput::RC_right) + else if ((neutrino_msg_t)g_settings.key_pagedown) m_pcLastPlay->scrollPageDown(1); else if (msg == CRCInput::RC_play) markItem(m_pcLastPlay); @@ -2055,9 +2055,9 @@ bool CMovieBrowser::onButtonPressLastRecordList(neutrino_msg_t msg) m_pcLastRecord->scrollLineUp(1); else if (msg == CRCInput::RC_down) m_pcLastRecord->scrollLineDown(1); - else if (msg == CRCInput::RC_left) + else if ((neutrino_msg_t)g_settings.key_pageup) m_pcLastRecord->scrollPageUp(1); - else if (msg == CRCInput::RC_right) + else if ((neutrino_msg_t)g_settings.key_pagedown) m_pcLastRecord->scrollPageDown(1); else if (msg == CRCInput::RC_play) markItem(m_pcLastRecord); @@ -2123,14 +2123,6 @@ bool CMovieBrowser::onButtonPressFilterList(neutrino_msg_t msg) } } } - else if (msg == CRCInput::RC_left) - { - m_pcFilter->scrollPageUp(1); - } - else if (msg == CRCInput::RC_right) - { - m_pcFilter->scrollPageDown(1); - } else { // default