diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index bf8ddf089..5bae03ebb 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -148,8 +148,8 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) // define classes CSubChannelSelectMenu subchanselect; - CStreamFeaturesChangeExec StreamFeaturesChanger; - CNeutrinoApp * neutrino = CNeutrinoApp::getInstance(); + CPluginsExec plugins; + CNeutrinoApp * neutrino = CNeutrinoApp::getInstance(); std::string txt = g_settings.usermenu[button]->title; 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); //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count)); 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->addItem(menu_item, false); @@ -328,7 +328,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) } case SNeutrinoSettings::ITEM_VTXT: 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); break; case SNeutrinoSettings::ITEM_IMAGEINFO: diff --git a/src/system/setting_helpers.cpp b/src/system/setting_helpers.cpp index 73454f727..0640a2d4d 100644 --- a/src/system/setting_helpers.cpp +++ b/src/system/setting_helpers.cpp @@ -356,30 +356,17 @@ int CNVODChangeExec::exec(CMenuTarget* parent, const std::string & actionKey) 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()); if(parent != NULL) parent->hide(); - // -- obsolete (rasc 2004-06-10) - // if (sel==-1) - // { - // CStreamInfo StreamInfo; - // StreamInfo.exec(NULL, ""); - // } else + if(actionKey == "teletext") { g_RCInput->postMsg(CRCInput::RC_timeout, 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) { diff --git a/src/system/setting_helpers.h b/src/system/setting_helpers.h index dbe1c94fa..678ad84a7 100644 --- a/src/system/setting_helpers.h +++ b/src/system/setting_helpers.h @@ -115,7 +115,7 @@ class CNVODChangeExec : public CMenuTarget int exec(CMenuTarget* parent, const std::string & actionKey); }; -class CStreamFeaturesChangeExec : public CMenuTarget +class CPluginsExec : public CMenuTarget { public: int exec(CMenuTarget* parent, const std::string & actionKey);