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

infoviewer_bb: remove arbitrarily titles from color buttons

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d144ad685
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)

Origin message was:
------------------
- infoviewer_bb: remove arbitrarily titles from color buttons

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-12-27 22:19:43 +01:00
parent b0fb5e4f83
commit dffafb7c6a
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/infoviewer_bb.cpp
View File

@@ -230,8 +230,6 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_RED]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_RED]->title;
if (text.empty())
text = g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST);
break; break;
case CInfoViewerBB::BUTTON_GREEN: case CInfoViewerBB::BUTTON_GREEN:
pers = SNeutrinoSettings::P_MAIN_GREEN_BUTTON; pers = SNeutrinoSettings::P_MAIN_GREEN_BUTTON;
@@ -251,11 +249,6 @@ void CInfoViewerBB::getBBButtonInfo()
break; 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()) {
int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid;
if (text.empty()){
text = g_RemoteControl->current_PIDs.APIDs[selected].desc;
}
} }
break; break;
case CInfoViewerBB::BUTTON_YELLOW: case CInfoViewerBB::BUTTON_YELLOW:
@@ -272,8 +265,6 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_YELLOW]->title;
if (text.empty())
text = g_Locale->getText((g_RemoteControl->are_subchannels) ? LOCALE_INFOVIEWER_SUBSERVICE : LOCALE_INFOVIEWER_SELECTTIME);
break; break;
case CInfoViewerBB::BUTTON_BLUE: case CInfoViewerBB::BUTTON_BLUE:
pers = SNeutrinoSettings::P_MAIN_BLUE_BUTTON; pers = SNeutrinoSettings::P_MAIN_BLUE_BUTTON;
@@ -289,8 +280,6 @@ void CInfoViewerBB::getBBButtonInfo()
if (!text.empty()) if (!text.empty())
break; break;
text = g_settings.usermenu[SNeutrinoSettings::BUTTON_BLUE]->title; text = g_settings.usermenu[SNeutrinoSettings::BUTTON_BLUE]->title;
if (text.empty())
text = g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO);
break; break;
default: default:
break; break;