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

gui/mediaplayer.cpp: make upnpbrowsergui static

Browse Source
This commit is contained in:
[CST] Focus
2013-09-03 11:42:09 +04:00
parent 418588e14a
commit e2f4eff598
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/mediaplayer.cpp
View File

@@ -149,7 +149,7 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
CMenuForwarder *fw_pviewer = NULL; CMenuForwarder *fw_pviewer = NULL;
CPictureViewerGui *pictureviewergui = NULL; CPictureViewerGui *pictureviewergui = NULL;
#if ENABLE_UPNP #if ENABLE_UPNP
CUpnpBrowserGui *upnpbrowsergui = NULL; static CUpnpBrowserGui *upnpbrowsergui = NULL;
CMenuForwarder *fw_upnp = NULL; CMenuForwarder *fw_upnp = NULL;
#endif #endif
CMenuWidget *moviePlayer = NULL; CMenuWidget *moviePlayer = NULL;
@@ -185,7 +185,8 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW); fw_pviewer->setHint(NEUTRINO_ICON_HINT_PICVIEW, LOCALE_MENU_HINT_PICVIEW);
#if ENABLE_UPNP #if ENABLE_UPNP
//upnp browser //upnp browser
upnpbrowsergui = new CUpnpBrowserGui(); if (!upnpbrowsergui)
upnpbrowsergui = new CUpnpBrowserGui();
fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0); fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, upnpbrowsergui, NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
#endif #endif
// media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK); // media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK);
@@ -237,7 +238,7 @@ int CMediaPlayerMenu::initMenuMedia(CMenuWidget *m, CPersonalizeGui *p)
delete personalize; delete personalize;
delete pictureviewergui; delete pictureviewergui;
#if ENABLE_UPNP #if ENABLE_UPNP
delete upnpbrowsergui; //delete upnpbrowsergui;
#endif #endif
setUsageMode();//set default usage_mode setUsageMode();//set default usage_mode