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

setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 237892ffd2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-08 (Mon, 08 Sep 2014)

Origin message was:
------------------
- setting_helpers: rename CStreamFeaturesChangeExec to CPluginsExec

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2014-09-08 16:33:26 +02:00
parent 86f7ef24e9
commit 167f8e295b
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/user_menue.cpp
View File

@@ -148,8 +148,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
// define classes // define classes
CSubChannelSelectMenu subchanselect; CSubChannelSelectMenu subchanselect;
CStreamFeaturesChangeExec StreamFeaturesChanger; CPluginsExec plugins;
CNeutrinoApp * neutrino = CNeutrinoApp::getInstance(); CNeutrinoApp * neutrino = CNeutrinoApp::getInstance();
std::string txt = g_settings.usermenu[button]->title; std::string txt = g_settings.usermenu[button]->title;
if (button < COL_BUTTONMAX && txt.empty()) if (button < COL_BUTTONMAX && txt.empty())
@@ -316,7 +316,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
neutrino_msg_t d_key = g_PluginList->getKey(count); neutrino_msg_t d_key = g_PluginList->getKey(count);
//printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count)); //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
keyhelper.get(&key,&icon, d_key); keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &StreamFeaturesChanger, id, key, icon); menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, &plugins, id, key, icon);
menu_item->setHint("", g_PluginList->getDescription(count)); menu_item->setHint("", g_PluginList->getDescription(count));
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
@@ -328,7 +328,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
} }
case SNeutrinoSettings::ITEM_VTXT: case SNeutrinoSettings::ITEM_VTXT:
keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, &StreamFeaturesChanger, "teletext", key, icon); menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, &plugins, "teletext", key, icon);
// FIXME menu_item->setHint("", NONEXISTANT_LOCALE); // FIXME menu_item->setHint("", NONEXISTANT_LOCALE);
break; break;
case SNeutrinoSettings::ITEM_IMAGEINFO: case SNeutrinoSettings::ITEM_IMAGEINFO:

19
src/system/setting_helpers.cpp
View File

@@ -356,30 +356,17 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey)
return menu_return::RETURN_EXIT; return menu_return::RETURN_EXIT;
} }
int CStreamFeaturesChangeExec::exec(CMenuTarget* parent, const std::string & actionKey) int CPluginsExec::exec(CMenuTarget* parent, const std::string & actionKey)
{ {
//printf("CStreamFeaturesChangeExec exec: %s\n", actionKey.c_str()); //printf("CPluginsExec exec: %s\n", actionKey.c_str());
int sel= atoi(actionKey.c_str()); int sel= atoi(actionKey.c_str());
if(parent != NULL) if(parent != NULL)
parent->hide(); parent->hide();
// -- obsolete (rasc 2004-06-10)
// if (sel==-1)
// {
// CStreamInfo StreamInfo;
// StreamInfo.exec(NULL, "");
// } else
if(actionKey == "teletext") { if(actionKey == "teletext") {
g_RCInput->postMsg(CRCInput::RC_timeout, 0); g_RCInput->postMsg(CRCInput::RC_timeout, 0);
g_RCInput->postMsg(CRCInput::RC_text, 0); g_RCInput->postMsg(CRCInput::RC_text, 0);
#if 0
g_RCInput->clearRCMsg();
tuxtx_main(g_RCInput->getFileHandle(), frameBuffer->getFrameBufferPointer(), g_RemoteControl->current_PIDs.PIDs.vtxtpid);
frameBuffer->paintBackground();
if(!g_settings.cacheTXT)
tuxtxt_stop();
g_RCInput->clearRCMsg();
#endif
} }
else if (sel>=0) else if (sel>=0)
{ {

2
src/system/setting_helpers.h
View File

@@ -115,7 +115,7 @@ class CNVODChangeExec : public CMenuTarget
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
}; };
class CStreamFeaturesChangeExec : public CMenuTarget class CPluginsExec : public CMenuTarget
{ {
public: public:
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);