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

Remove redundant CStreamInfo2Handler

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1894 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-11-25 10:03:56 +00:00
parent cefd76754d
commit c41baaaeab
3 changed files with 4 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/streaminfo2.cpp
View File

@@ -109,13 +109,6 @@ CStreamInfo2::~CStreamInfo2 ()
ts_close(); ts_close();
} }
void CStreamInfo2::exec()
{
paint(paint_mode);
doSignalStrengthLoop();
hide();
}
int CStreamInfo2::exec (CMenuTarget * parent, const std::string &) int CStreamInfo2::exec (CMenuTarget * parent, const std::string &)
{ {
@@ -940,17 +933,6 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos)
if(box_h2 == 0) if(box_h2 == 0)
box_h2 = ypos - ypos1; 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 * some definition

6
src/gui/streaminfo2.h
View File

@@ -103,16 +103,10 @@ class CStreamInfo2 : public CMenuTarget
CStreamInfo2(); CStreamInfo2();
~CStreamInfo2(); ~CStreamInfo2();
void exec();
void hide(); void hide();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget* parent, const std::string & actionKey);
}; };
class CStreamInfo2Handler : public CMenuTarget
{
public:
int exec( CMenuTarget* parent, const std::string &actionKey);
};
#endif #endif

8
src/gui/user_menue.cpp
View File

@@ -111,7 +111,7 @@ bool CUserMenu::showUserMenu(int button)
CAudioSelectMenuHandler* tmpAudioSelectMenuHandler = NULL; CAudioSelectMenuHandler* tmpAudioSelectMenuHandler = NULL;
CMenuWidget* tmpNVODSelector = NULL; CMenuWidget* tmpNVODSelector = NULL;
CSubChannelSelectMenu subchanselect; CSubChannelSelectMenu subchanselect;
CStreamInfo2Handler* tmpStreamInfo2Handler = NULL; CStreamInfo2 * streamInfo = NULL;
CEventListHandler* tmpEventListHandler = NULL; CEventListHandler* tmpEventListHandler = NULL;
CEPGplusHandler* tmpEPGplusHandler = NULL; CEPGplusHandler* tmpEPGplusHandler = NULL;
CEPGDataHandler* tmpEPGDataHandler = NULL; CEPGDataHandler* tmpEPGDataHandler = NULL;
@@ -275,9 +275,9 @@ bool CUserMenu::showUserMenu(int button)
case SNeutrinoSettings::ITEM_TECHINFO: case SNeutrinoSettings::ITEM_TECHINFO:
menu_items++; menu_items++;
menu_prev = SNeutrinoSettings::ITEM_TECHINFO; menu_prev = SNeutrinoSettings::ITEM_TECHINFO;
tmpStreamInfo2Handler = new CStreamInfo2Handler(); streamInfo = new CStreamInfo2();
keyhelper.get(&key,&icon,CRCInput::RC_blue); 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); menu->addItem(menu_item, false);
break; break;
case SNeutrinoSettings::ITEM_PLUGIN: case SNeutrinoSettings::ITEM_PLUGIN:
@@ -407,7 +407,7 @@ bool CUserMenu::showUserMenu(int button)
if (tmpPauseSectionsdNotifier) delete tmpPauseSectionsdNotifier; if (tmpPauseSectionsdNotifier) delete tmpPauseSectionsdNotifier;
if (tmpAudioSelectMenuHandler) delete tmpAudioSelectMenuHandler; if (tmpAudioSelectMenuHandler) delete tmpAudioSelectMenuHandler;
if (tmpNVODSelector) delete tmpNVODSelector; if (tmpNVODSelector) delete tmpNVODSelector;
if (tmpStreamInfo2Handler) delete tmpStreamInfo2Handler; if (streamInfo) delete streamInfo;
if (tmpEventListHandler) delete tmpEventListHandler; if (tmpEventListHandler) delete tmpEventListHandler;
if (tmpEPGplusHandler) delete tmpEPGplusHandler; if (tmpEPGplusHandler) delete tmpEPGplusHandler;
if (tmpEPGDataHandler) delete tmpEPGDataHandler; if (tmpEPGDataHandler) delete tmpEPGDataHandler;