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

infoviewer_bb: show resolution in livestream mode on color button

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07b1f6f849
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-03-03 (Thu, 03 Mar 2016)

Origin message was:
------------------
- infoviewer_bb: show resolution in livestream mode on color button

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-03-03 09:03:56 +01:00
committed by Michael Liebmann
parent 8180e49811
commit fe7c215286
2 changed files with 9 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/infoviewer_bb.cpp
View File

@@ -222,13 +222,6 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_RED;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
#if 0
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
active = true;
break;
}
#endif
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_red, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
@@ -244,13 +237,6 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_GREEN;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
#if 0
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
active = true;
break;
}
#endif
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
@@ -266,13 +252,6 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_YELLOW;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
#if 1
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
active = true;
break;
}
#endif
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_yellow, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
@@ -288,13 +267,6 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_BLUE;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
#if 0
if (mode == NeutrinoMessages::mode_webtv && !CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty()) {
text = g_Locale->getText(LOCALE_LIVESTREAM_RESOLUTION);
active = true;
break;
}
#endif
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_blue, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())

9
src/gui/user_menue.cpp
View File

@@ -525,6 +525,15 @@ const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool retu
case SNeutrinoSettings::ITEM_NONE:
case SNeutrinoSettings::ITEM_BAR:
case SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION:
if(loc == NONEXISTANT_LOCALE && !text) {
/* TODO
get const char *valname from struct
keyval_ext LIVESTREAM_RESOLUTION_OPTIONS
*/
text = to_string(g_settings.livestreamResolution).c_str();
} else
return_title = true;
active = true;
continue;
case SNeutrinoSettings::ITEM_EPG_MISC:
return_title = true;