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

Revert "- infoviewer_bb: use getMoviePlayerButtonName in mode_audio too;"

Browse Source 
This reverts ugly commit a2b28048d6
This commit is contained in:
svenhoefer
2016-01-25 22:45:18 +01:00
parent 0c2a3a9853
commit 61e457c0a6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/infoviewer_bb.cpp
View File

@@ -221,7 +221,7 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_RED;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_audio) {
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_red, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
@@ -236,7 +236,7 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_GREEN;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_audio) {
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_green, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
@@ -251,7 +251,7 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_YELLOW;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_audio) {
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_yellow, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
@@ -266,7 +266,7 @@ void CInfoViewerBB::getBBButtonInfo()
icon = NEUTRINO_ICON_BUTTON_BLUE;
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_audio) {
if (mode == NeutrinoMessages::mode_ts) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_blue, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
@@ -279,8 +279,8 @@ void CInfoViewerBB::getBBButtonInfo()
default:
break;
}
//label audio control button in movieplayer/upnp mode
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_audio)
//label audio control button in movieplayer mode
if (mode == NeutrinoMessages::mode_ts)
{
if (!CMoviePlayerGui::getInstance().timeshift)
{