From 0e779b8b437200041dd38593675e5aa7188b2c6e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 29 Dec 2015 12:49:52 +0100 Subject: [PATCH] infoviewer_bb: remove labeling of audio control from green button ... ... now user can use any color key to control audio Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0561f6e663b6ca6fed4921237bdc35ae7f8942f8 Author: vanhofen Date: 2015-12-29 (Tue, 29 Dec 2015) Origin message was: ------------------ - infoviewer_bb: remove labeling of audio control from green button ... ... now user can use any color key to control audio ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index d2a8255c7..52ae55426 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -238,18 +238,13 @@ void CInfoViewerBB::getBBButtonInfo() mode = CNeutrinoApp::getInstance()->getMode(); if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) { text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active); - if (text != g_Locale->getText(LOCALE_MPKEY_AUDIO)) + if (!text.empty()) break; } text = CUserMenu::getUserMenuButtonName(1, active); - if (!text.empty() && (mode == NeutrinoMessages::mode_tv || mode == NeutrinoMessages::mode_radio)) + if (!text.empty()) break; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title; - if (text != g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD)) - break; - if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) { - text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName(); - } break; case CInfoViewerBB::BUTTON_YELLOW: pers = SNeutrinoSettings::P_MAIN_YELLOW_BUTTON; @@ -284,6 +279,17 @@ void CInfoViewerBB::getBBButtonInfo() default: break; } + //label audio control button in movieplayer/upnp mode + if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) + { + if (!CMoviePlayerGui::getInstance().timeshift) + { + if (text == g_Locale->getText(LOCALE_MPKEY_AUDIO)) + { + text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName(); + } + } + } bbButtonInfo[i].w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(text) + w + 10; bbButtonInfo[i].cx = w + 5; bbButtonInfo[i].h = h;