From 559c7c871e92cb15404b899b604dbf8bd078ab73 Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Sun, 13 Nov 2011 14:41:06 +0000 Subject: [PATCH] Timeshift (display the infobar) - Infobar is visible when playback (Timeshift pause = off) is running. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1843 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/76bb470ea0588cafc5d8cf73e927d865e52f257e Author: Michael Liebmann Date: 2011-11-13 (Sun, 13 Nov 2011) Origin message was: ------------------ * Timeshift (display the infobar) - Infobar is visible when playback (Timeshift pause = off) is running. git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1843 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- src/gui/movieplayer.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index c20db6481..1f12e53c4 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -459,6 +459,7 @@ extern bool has_hdd; #define TIMESHIFT_SECONDS 3 void CMoviePlayerGui::PlayFile(void) { + bool first_start_timeshift = false; neutrino_msg_t msg; neutrino_msg_data_t data; int position = 0, duration = 0; @@ -554,11 +555,8 @@ void CMoviePlayerGui::PlayFile(void) isBookmark = false; timesh = false; start_timeshift = true; + first_start_timeshift = true; CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), - CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), - CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), - CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); } if (isBookmark) { @@ -1313,6 +1311,14 @@ void CMoviePlayerGui::PlayFile(void) } } + if (first_start_timeshift) { + g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), + CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), + CNeutrinoApp::getInstance()->channelList->getActiveSatellitePosition(), + CNeutrinoApp::getInstance()->channelList->getActiveChannel_ChannelID()); + first_start_timeshift = false; + } + if (exit) { printf("CMoviePlayerGui::PlayFile: exit, isMovieBrowser %d p_movie_info %x\n", isMovieBrowser, (int) p_movie_info); if (isMovieBrowser == true && p_movie_info != NULL) {