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

infoviewer_bb: remove labeling of audio control from green button ...

Browse Source 
... now user can use any color key to control audio


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0561f6e663
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2015-12-29 12:49:52 +01:00
parent dffafb7c6a
commit 0e779b8b43
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/gui/infoviewer_bb.cpp
View File

@@ -238,18 +238,13 @@ void CInfoViewerBB::getBBButtonInfo()
mode = CNeutrinoApp::getInstance()->getMode(); mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) { if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active); text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active);
if (text != g_Locale->getText(LOCALE_MPKEY_AUDIO)) if (!text.empty())
break; break;
} }
text = CUserMenu::getUserMenuButtonName(1, active); text = CUserMenu::getUserMenuButtonName(1, active);
if (!text.empty() && (mode == NeutrinoMessages::mode_tv || mode == NeutrinoMessages::mode_radio)) if (!text.empty())
break; 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))
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; break;
case CInfoViewerBB::BUTTON_YELLOW: case CInfoViewerBB::BUTTON_YELLOW:
pers = SNeutrinoSettings::P_MAIN_YELLOW_BUTTON; pers = SNeutrinoSettings::P_MAIN_YELLOW_BUTTON;
@@ -284,6 +279,17 @@ void CInfoViewerBB::getBBButtonInfo()
default: default:
break; 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].w = g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->getRenderWidth(text) + w + 10;
bbButtonInfo[i].cx = w + 5; bbButtonInfo[i].cx = w + 5;
bbButtonInfo[i].h = h; bbButtonInfo[i].h = h;