From 027b5a06a13b693e9b45a8ce9e272cd9092b8494 Mon Sep 17 00:00:00 2001
From: micha-bbg <micha-bbg@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Wed, 26 Oct 2011 19:51:06 +0000
Subject: [PATCH] Infobar blocked buttons in time shift.

- When pressing the player buttons (play, pause, etc.)
  in the infobar is now hidden and runs the appropriate commands.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1778 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/infoviewer.cpp  | 12 ++++++++++++
 src/gui/movieplayer.cpp |  2 ++
 src/gui/movieplayer.h   |  1 +
 3 files changed, 15 insertions(+)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 6d1193ef0..d035edf57 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -944,6 +944,18 @@ void CInfoViewer::loop(int fadeValue, bool show_dot ,bool fadeIn)
 			}
 			else
 				res = CNeutrinoApp::getInstance()->handleMsg(msg, data);
+
+		} else if (CMoviePlayerGui::getInstance().start_timeshift && (msg == NeutrinoMessages::EVT_TIMER)) {
+			CMoviePlayerGui::getInstance().start_timeshift = false;
+		} else if (CMoviePlayerGui::getInstance().timeshift && ((msg == (neutrino_msg_t) g_settings.mpkey_rewind)  || \
+		   							(msg == (neutrino_msg_t) g_settings.mpkey_forward) || \
+		   							(msg == (neutrino_msg_t) g_settings.mpkey_pause)   || \
+		   							(msg == (neutrino_msg_t) g_settings.mpkey_stop)    || \
+		   							(msg == (neutrino_msg_t) g_settings.mpkey_play)    || \
+		   							(msg == (neutrino_msg_t) g_settings.mpkey_time)    || \
+		   							(msg == (neutrino_msg_t) g_settings.key_timeshift))) {
+			g_RCInput->postMsg (msg, data);
+			res = messages_return::cancel_info;
 		}
 	}
 
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index b9efbeff7..c11769f58 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -214,6 +214,7 @@ void CMoviePlayerGui::Init(void)
 	jumpseconds = 0;
 	showaudioselectdialog = false;
 	timeshift = 0;
+	start_timeshift = false;
 }
 
 CMoviePlayerGui::~CMoviePlayerGui()
@@ -552,6 +553,7 @@ void CMoviePlayerGui::PlayFile(void)
 			open_filebrowser = false;
 			isBookmark = false;
 			timesh = false;
+			start_timeshift = true;
 			CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO);
 			g_InfoViewer->showTitle(CNeutrinoApp::getInstance()->channelList->getActiveChannelNumber(), 
 						CNeutrinoApp::getInstance()->channelList->getActiveChannelName(), 
diff --git a/src/gui/movieplayer.h b/src/gui/movieplayer.h
index 05b7c68f0..be91d04be 100644
--- a/src/gui/movieplayer.h
+++ b/src/gui/movieplayer.h
@@ -138,6 +138,7 @@ class CMoviePlayerGui : public CMenuTarget
 	void updateLcd(const std::string & sel_filename);
 	bool Playing();
 	int timeshift;
+	bool start_timeshift;
 	int file_prozent;
 };