From e65d663f3f1569fd5be0229d4703d4785c6030d3 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Mon, 21 Apr 2014 10:32:01 +0200 Subject: [PATCH] MoviePlayer: Fix display 'info clock' and 'file time' when show movie infos Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/92cc47f383646cb1d662167f10149f4b3ad36f0d Author: Michael Liebmann Date: 2014-04-21 (Mon, 21 Apr 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 12 +++++++++--- src/gui/timeosd.h | 2 ++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index 47c7bd84d..d50662d47 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1285,13 +1285,19 @@ void CMoviePlayerGui::handleMovieBrowser(neutrino_msg_t msg, int /*position*/) } } } else if (msg == NeutrinoMessages::SHOW_EPG && p_movie_info) { + CTimeOSD::mode m_mode = FileTime.getMode(); bool restore = FileTime.IsVisible(); - FileTime.kill(); + if (restore) + FileTime.kill(); + InfoClock->enableInfoClock(false); cMovieInfo.showMovieInfo(*p_movie_info); - if (restore) - FileTime.show(position); + InfoClock->enableInfoClock(true); + if (restore) { + FileTime.setMode(m_mode); + FileTime.update(position, duration); + } } return; } diff --git a/src/gui/timeosd.h b/src/gui/timeosd.h index 3b030a861..b46fdbecd 100644 --- a/src/gui/timeosd.h +++ b/src/gui/timeosd.h @@ -58,5 +58,7 @@ class CTimeOSD : public CComponentsFrmClock bool IsVisible() {return m_mode != MODE_HIDE;} void update(int position, int duration); void switchMode(int position, int duration); + mode getMode() { return m_mode; }; + void setMode (mode mode_) { m_mode = mode_; }; }; #endif