neutrino: add configure switch to disable upnp

Add a --disable-upnp switch to disable the UPNP browser for
those who want to use more modern external solutions.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1830 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
seife
2011-11-05 17:10:42 +00:00
parent e69a204e73
commit 1bb7728e6d
6 changed files with 35 additions and 5 deletions

View File

@@ -39,7 +39,9 @@
#include "gui/movieplayer.h"
#include "gui/pictureviewer.h"
#if ENABLE_UPNP
#include "gui/upnpbrowser.h"
#endif
#include <gui/widget/icons.h>
@@ -116,7 +118,9 @@ void CMediaPlayerMenu::showMenu()
CMenuForwarder *fw_inet = NULL;
CMenuForwarder *fw_mp = NULL;
CMenuForwarder *fw_pviewer = NULL;
#if ENABLE_UPNP
CMenuForwarder *fw_upnp = NULL;
#endif
CMenuWidget *moviePlayer = NULL;
if (usage_mode != MODE_VIDEO)
@@ -143,9 +147,10 @@ void CMediaPlayerMenu::showMenu()
//pictureviewer
fw_pviewer = new CMenuForwarder(LOCALE_MAINMENU_PICTUREVIEWER, true, NULL, new CPictureViewerGui(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
#if ENABLE_UPNP
//upnp browser
fw_upnp = new CMenuForwarder(LOCALE_UPNPBROWSER_HEAD, true, NULL, new CUpnpBrowserGui(), NULL, CRCInput::RC_0, NEUTRINO_ICON_BUTTON_0);
#endif
media->addIntroItems(NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, usage_mode == MODE_AUDIO ? CMenuWidget::BTN_TYPE_CANCEL : CMenuWidget::BTN_TYPE_BACK);
}
@@ -175,9 +180,10 @@ void CMediaPlayerMenu::showMenu()
//pictureviewer
media->addItem(fw_pviewer);
#if ENABLE_UPNP
//upnp browser
media->addItem(fw_upnp);
#endif
}
media->exec(NULL, "");