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: show plugin name, when movieplayer-plugin is selected

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b74f601db
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-01-25 (Mon, 25 Jan 2016)

Origin message was:
------------------
- infoviewer: show plugin name, when movieplayer-plugin is selected

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-01-25 12:00:47 +01:00
parent fea7c86ba5
commit 921176b2a1
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/infoviewer_bb.cpp
View File

@@ -222,7 +222,7 @@ void CInfoViewerBB::getBBButtonInfo()
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_red, active);
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_red, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
}
@@ -237,7 +237,7 @@ void CInfoViewerBB::getBBButtonInfo()
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
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, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
}
@@ -252,7 +252,7 @@ void CInfoViewerBB::getBBButtonInfo()
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_yellow, active);
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_yellow, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
}
@@ -267,7 +267,7 @@ void CInfoViewerBB::getBBButtonInfo()
frameBuffer->getIconSize(icon.c_str(), &w, &h);
mode = CNeutrinoApp::getInstance()->getMode();
if (mode == NeutrinoMessages::mode_ts || mode == NeutrinoMessages::mode_webtv || mode == NeutrinoMessages::mode_audio) {
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_blue, active);
text = CKeybindSetup::getMoviePlayerButtonName(CRCInput::RC_blue, active, g_settings.infobar_buttons_usertitle);
if (!text.empty())
break;
}

7
src/gui/keybind_setup.cpp
View File

@@ -569,7 +569,7 @@ bool CKeybindSetup::changeNotify(const neutrino_locale_t OptionName, void * /* d
return false;
}
const char *CKeybindSetup::getMoviePlayerButtonName(const neutrino_msg_t key, bool &active)
const char *CKeybindSetup::getMoviePlayerButtonName(const neutrino_msg_t key, bool &active, bool return_title)
{
active = false;
for (unsigned int i = MPKEY_REWIND; i <= MPKEY_PLUGIN; i++)
@@ -577,7 +577,10 @@ const char *CKeybindSetup::getMoviePlayerButtonName(const neutrino_msg_t key, bo
if ((uint32_t)*key_settings[i].keyvalue_p == (unsigned int)key)
{
active = true;
return g_Locale->getText(key_settings[i].keydescription);
if (!return_title && (key_settings[i].keydescription == LOCALE_MPKEY_PLUGIN))
return g_settings.movieplayer_plugin.c_str();
else
return g_Locale->getText(key_settings[i].keydescription);
}
}
return "";

2
src/gui/keybind_setup.h
View File

@@ -112,7 +112,7 @@ class CKeybindSetup : public CMenuTarget, public CChangeObserver
~CKeybindSetup();
int exec(CMenuTarget* parent, const std::string & actionKey);
bool changeNotify(const neutrino_locale_t OptionName, void * data);
static const char *getMoviePlayerButtonName(const neutrino_msg_t key, bool &active);
static const char *getMoviePlayerButtonName(const neutrino_msg_t key, bool &active, bool return_title = false);
};
#endif