diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 9c4435db9..0515b2815 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -109,13 +109,6 @@ CStreamInfo2::~CStreamInfo2 () ts_close(); } -void CStreamInfo2::exec() -{ - paint(paint_mode); - doSignalStrengthLoop(); - hide(); -} - int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) { @@ -940,17 +933,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) if(box_h2 == 0) box_h2 = ypos - ypos1; } -int CStreamInfo2Handler::exec(CMenuTarget* parent, const std::string &/*actionkey*/) -{ - int res = menu_return::RETURN_EXIT_ALL; - if (parent){ - parent->hide(); - } - CStreamInfo2 *e = new CStreamInfo2; - e->exec(); - delete e; - return res; -} /* * some definition diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h index 21cafc63e..5a2d19115 100644 --- a/src/gui/streaminfo2.h +++ b/src/gui/streaminfo2.h @@ -103,16 +103,10 @@ class CStreamInfo2 : public CMenuTarget CStreamInfo2(); ~CStreamInfo2(); - void exec(); void hide(); int exec(CMenuTarget* parent, const std::string & actionKey); }; -class CStreamInfo2Handler : public CMenuTarget -{ - public: - int exec( CMenuTarget* parent, const std::string &actionKey); -}; #endif diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index e33ff165f..7d84cc1a5 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -111,7 +111,7 @@ bool CUserMenu::showUserMenu(int button) CAudioSelectMenuHandler* tmpAudioSelectMenuHandler = NULL; CMenuWidget* tmpNVODSelector = NULL; CSubChannelSelectMenu subchanselect; - CStreamInfo2Handler* tmpStreamInfo2Handler = NULL; + CStreamInfo2 * streamInfo = NULL; CEventListHandler* tmpEventListHandler = NULL; CEPGplusHandler* tmpEPGplusHandler = NULL; CEPGDataHandler* tmpEPGDataHandler = NULL; @@ -275,9 +275,9 @@ bool CUserMenu::showUserMenu(int button) case SNeutrinoSettings::ITEM_TECHINFO: menu_items++; menu_prev = SNeutrinoSettings::ITEM_TECHINFO; - tmpStreamInfo2Handler = new CStreamInfo2Handler(); + streamInfo = new CStreamInfo2(); keyhelper.get(&key,&icon,CRCInput::RC_blue); - menu_item = new CMenuForwarder(LOCALE_EPGMENU_STREAMINFO, true, NULL, tmpStreamInfo2Handler , "-1", key, icon ); + menu_item = new CMenuForwarder(LOCALE_EPGMENU_STREAMINFO, true, NULL, streamInfo, "-1", key, icon ); menu->addItem(menu_item, false); break; case SNeutrinoSettings::ITEM_PLUGIN: @@ -407,7 +407,7 @@ bool CUserMenu::showUserMenu(int button) if (tmpPauseSectionsdNotifier) delete tmpPauseSectionsdNotifier; if (tmpAudioSelectMenuHandler) delete tmpAudioSelectMenuHandler; if (tmpNVODSelector) delete tmpNVODSelector; - if (tmpStreamInfo2Handler) delete tmpStreamInfo2Handler; + if (streamInfo) delete streamInfo; if (tmpEventListHandler) delete tmpEventListHandler; if (tmpEPGplusHandler) delete tmpEPGplusHandler; if (tmpEPGDataHandler) delete tmpEPGDataHandler;