mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +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

13
src/neutrino.cpp
View File

@@ -236,7 +236,6 @@ CBouquetList * RADIOallList;
CPlugins * g_PluginList;
CRemoteControl * g_RemoteControl;
SMSKeyInput * c_SMSKeyInput;
CMoviePlayerGui* moviePlayerGui;
CAudioSelectMenuHandler *audio_menu;
CPictureViewer * g_PicViewer;
CCAMMenuHandler * g_CamHandler;
@@ -2523,7 +2522,7 @@ printf("[neutrino] timeshift try, recordingstatus %d, rec dir %s, timeshift dir
if(g_RemoteControl->is_video_started) {
if(recordingstatus) {
//StopSubtitles();
moviePlayerGui->exec(NULL, tmode);
CMoviePlayerGui::getInstance().exec(NULL, tmode);
//StartSubtitles();
} else if(msg != CRCInput::RC_rewind) {
//StopSubtitles();
@@ -2535,7 +2534,7 @@ printf("[neutrino] timeshift try, recordingstatus %d, rec dir %s, timeshift dir
}
if(recordingstatus) {
//StopSubtitles();
moviePlayerGui->exec(NULL, tmode);
CMoviePlayerGui::getInstance().exec(NULL, tmode);
//StartSubtitles();
}
}
@@ -2590,7 +2589,7 @@ printf("[neutrino] direct record\n");
//StopSubtitles();
if( mode == mode_radio )
videoDecoder->StopPicture();
moviePlayerGui->exec(NULL, "tsmoviebrowser");
CMoviePlayerGui::getInstance().exec(NULL, "tsmoviebrowser");
if( mode == mode_radio )
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/radiomode.jpg");
//StartSubtitles();
@@ -3380,7 +3379,7 @@ skip_message:
lastMode=mode;
mode=mode_pic;
}
if((data & mode_mask)== mode_ts && moviePlayerGui->Playing()) {
if((data & mode_mask)== mode_ts && CMoviePlayerGui::getInstance().Playing()) {
if(mode == mode_radio)
videoDecoder->StopPicture();
lastMode=mode;
@@ -3529,7 +3528,7 @@ void CNeutrinoApp::ExitRun(const bool /*write_si*/, int retcode)
delete powerManager;
}
delete moviePlayerGui;
delete &CMoviePlayerGui::getInstance();
shutdown_cs_api();
system("/etc/init.d/rcK");
@@ -4465,7 +4464,7 @@ void stop_daemons(bool stopall)
printf("zapit shutdown done\n");
CVFD::getInstance()->Clear();
if(stopall) {
delete moviePlayerGui;
CMoviePlayerGui::Delete(); //remove instance
if (cpuFreq)
cpuFreq->SetCpuFreq(g_settings.cpufreq * 1000 * 1000);
if (powerManager) {