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

Infoclock: unify handling in some classes with singleton

Browse Source
This commit is contained in:
Thilo Graf
2016-02-29 08:05:05 +01:00
parent dcec44b8d6
commit 59d9b7068e
5 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/movieplayer.cpp
View File

@@ -74,7 +74,7 @@
extern cVideo * videoDecoder;
extern CRemoteControl *g_RemoteControl; /* neutrino.cpp */
extern CInfoClock *InfoClock;
extern CVolume* g_volume;
#define TIMESHIFT_SECONDS 3
@@ -459,7 +459,7 @@ void CMoviePlayerGui::ClearQueue()
void CMoviePlayerGui::EnableClockAndMute(bool enable)
{
CAudioMute::getInstance()->enableMuteIcon(enable);
InfoClock->enableInfoClock(enable);
CInfoClock::getInstance()->enableInfoClock(enable);
}
void CMoviePlayerGui::makeFilename()
@@ -1828,7 +1828,7 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
bool restore = FileTime.IsVisible();
if (restore)
FileTime.kill();
InfoClock->enableInfoClock(false);
CInfoClock::getInstance()->enableInfoClock(false);
if (isLuaPlay && haveLuaInfoFunc) {
int xres = 0, yres = 0, aspectRatio = 0, framerate = -1;
@@ -1843,7 +1843,7 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/)
else if (p_movie_info)
cMovieInfo.showMovieInfo(*p_movie_info);
InfoClock->enableInfoClock(true);
CInfoClock::getInstance()->enableInfoClock(true);
if (restore) {
FileTime.setMode(m_mode);
FileTime.update(position, duration);