mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
CMoviePlayerGui: Bind enable/disable FileTime to enableInfoClock()
Origin commit data
------------------
Branch: ni/coolstream
Commit: dc4ce280ed
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -100,6 +100,7 @@
|
||||
#include "gui/widget/menue.h"
|
||||
#include "gui/widget/msgbox.h"
|
||||
#include "gui/infoclock.h"
|
||||
#include "gui/timeosd.h"
|
||||
#include "gui/parentallock_setup.h"
|
||||
#ifdef ENABLE_PIP
|
||||
#include "gui/pipsetup.h"
|
||||
@@ -146,6 +147,7 @@
|
||||
int old_b_id = -1;
|
||||
|
||||
CInfoClock *InfoClock;
|
||||
CTimeOSD *FileTimeOSD;
|
||||
int allow_flash = 1;
|
||||
Zapit_config zapitCfg;
|
||||
char zapit_lat[20]="#";
|
||||
@@ -2155,6 +2157,8 @@ TIMER_START();
|
||||
|
||||
g_RemoteControl = new CRemoteControl;
|
||||
g_EpgData = new CEpgData;
|
||||
InfoClock = CInfoClock::getInstance();
|
||||
FileTimeOSD = CTimeOSD::getInstance();
|
||||
g_InfoViewer = new CInfoViewer;
|
||||
g_EventList = new CEventList;
|
||||
|
||||
@@ -2341,9 +2345,6 @@ void CNeutrinoApp::RealRun()
|
||||
|
||||
dprintf(DEBUG_NORMAL, "initialized everything\n");
|
||||
|
||||
//activating infoclock
|
||||
InfoClock = CInfoClock::getInstance();
|
||||
|
||||
if(g_settings.power_standby || init_cec_setting)
|
||||
standbyMode(true, true);
|
||||
|
||||
@@ -4224,6 +4225,8 @@ void stop_daemons(bool stopall, bool for_flash)
|
||||
videoDecoder->SetCECMode((VIDEO_HDMI_CEC_MODE)0);
|
||||
}
|
||||
|
||||
delete InfoClock;
|
||||
delete FileTimeOSD;
|
||||
delete &CMoviePlayerGui::getInstance();
|
||||
|
||||
CZapit::getInstance()->Stop();
|
||||
|
Reference in New Issue
Block a user