mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-18 02:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino multimedia-menu: add singelton,

Browse Source 
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1125c6ab1f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
*neutrino multimedia-menu: add singelton,
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2011-01-26 11:05:33 +00:00
parent fd617dd412
commit 32162e4af0
5 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/mediaplayer.cpp
View File

@@ -101,7 +101,7 @@ void CMediaPlayerMenu::showMenu()
media->addItem(new CMenuForwarder(LOCALE_INETRADIO_NAME, true, NULL, new CAudioPlayerGui(true), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
//movieplayer
CMenuWidget *moviePlayer = new CMenuWidget(LOCALE_MAINMENU_MOVIEPLAYER, NEUTRINO_ICON_MULTIMEDIA, width);
CMenuWidget *moviePlayer = new CMenuWidget(LOCALE_MAINMENU_MEDIA, NEUTRINO_ICON_MULTIMEDIA, width);
showMoviePlayer(moviePlayer);
media->addItem(new CMenuForwarder(LOCALE_MAINMENU_MOVIEPLAYER, true, NULL, moviePlayer, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
@@ -120,12 +120,12 @@ void CMediaPlayerMenu::showMenu()
//show movieplayer submenu with selectable items for moviebrowser or filebrowser
void CMediaPlayerMenu::showMoviePlayer(CMenuWidget *moviePlayer)
{
CMoviePlayerGui *movieplayer_gui = new CMoviePlayerGui();
moviePlayer->addIntroItems();
CMoviePlayerGui *movieplayer_gui = &CMoviePlayerGui::getInstance();
moviePlayer->addIntroItems(LOCALE_MAINMENU_MOVIEPLAYER);
moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEBROWSER_HEAD, true, NULL, movieplayer_gui, "tsmoviebrowser", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED));
moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_FILEPLAYBACK, true, NULL, movieplayer_gui, "fileplayback", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN));
// #if 0
// //moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_PESPLAYBACK, true, NULL, moviePlayerGui, "pesplayback"));
// //moviePlayer->addItem(new CMenuForwarder(LOCALE_MOVIEPLAYER_TSPLAYBACK_PC, true, NULL, moviePlayerGui, "tsplayback_pc"));

26
src/gui/movieplayer.cpp
View File

@@ -78,6 +78,7 @@
#include <playback.h>
#include "libtuxtxt/teletext.h"
int dvbsub_start(int pid);
int dvbsub_pause();
@@ -141,6 +142,31 @@ int CAPIDSelectExec::exec(CMenuTarget * /*parent*/, const std::string & actionKe
return menu_return::RETURN_EXIT;
}
CMoviePlayerGui* CMoviePlayerGui::instance_mp = NULL;
CMoviePlayerGui& CMoviePlayerGui::getInstance()
{
if ( !instance_mp )
{
instance_mp = new CMoviePlayerGui();
printf("[neutrino CMoviePlayerGui] Instance created...\n");
}
return *instance_mp;
}
void CMoviePlayerGui::Delete()
{
if ( instance_mp )
{
delete instance_mp;
printf("[neutrino CMoviePlayerGui] Instance removed...\n");
}
instance_mp = NULL;
}
CMoviePlayerGui::CMoviePlayerGui()
{
Init();

8
src/gui/movieplayer.h
View File

@@ -111,9 +111,17 @@ class CMoviePlayerGui : public CMenuTarget
void showHelpVLC(void);
void callInfoViewer(const std::string & epg_title, const std::string & epg_info1,
const std::string & epg_channel, const int duration, const int pos);
static CMoviePlayerGui* instance_mp;
CMoviePlayerGui(const CMoviePlayerGui&) {};
public:
CMoviePlayerGui();
~CMoviePlayerGui();
static CMoviePlayerGui& getInstance();
static void Delete();
int exec(CMenuTarget* parent, const std::string & actionKey);
void updateLcd(const std::string & sel_filename);
bool Playing();