mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

infoviewer_bb: fix text for green button in movieplayer mode

Browse Source 
Origin commit data
------------------
Commit: a50bd5bb97
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-14 (Mon, 14 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: fix text for green button in movieplayer mode
This commit is contained in:
vanhofen
2015-12-14 19:01:07 +01:00
parent 1652d0201a
commit fec0d26c75
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/infoviewer_bb.cpp
View File

@@ -237,19 +237,18 @@ void CInfoViewerBB::getBBButtonInfo()
case CInfoViewerBB::BUTTON_GREEN: case CInfoViewerBB::BUTTON_GREEN:
icon = NEUTRINO_ICON_BUTTON_GREEN; icon = NEUTRINO_ICON_BUTTON_GREEN;
frameBuffer->getIconSize(icon.c_str(), &w, &h); frameBuffer->getIconSize(icon.c_str(), &w, &h);
text = CUserMenu::getUserMenuButtonName(1, active);
mode = CNeutrinoApp::getInstance()->getMode();
if (!text.empty() && mode < NeutrinoMessages::mode_audio)
break;
mode = CNeutrinoApp::getInstance()->getMode(); mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts) { if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active); text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active);
if (!text.empty()) if (text != g_Locale->getText(LOCALE_MPKEY_AUDIO))
break; break;
} }
text = CUserMenu::getUserMenuButtonName(1, active);
if (!text.empty() && (mode == NeutrinoMessages::mode_tv || mode == NeutrinoMessages::mode_radio))
break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_GREEN]->title;
if (text == g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD)) if (text != g_Locale->getText(LOCALE_AUDIOSELECTMENUE_HEAD))
text = ""; break;
if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) { if ((mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) && !CMoviePlayerGui::getInstance().timeshift) {
text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName(); text = CMoviePlayerGui::getInstance(mode == NeutrinoMessages::mode_webtv).CurrentAudioName();
} else if (!g_RemoteControl->current_PIDs.APIDs.empty()) { } else if (!g_RemoteControl->current_PIDs.APIDs.empty()) {