From b643641e2c6288eff61d0346a3dda82bd820b3b7 Mon Sep 17 00:00:00 2001
From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 5 Nov 2009 11:37:29 +0100
Subject: [PATCH] disable fast winding for non TS mediafiles until we have a
 usable solution for this..

---
 .../Extensions/DVDPlayer/src/servicedvd.cpp   |  2 +-
 lib/python/Screens/InfoBarGenerics.py         | 14 ++++++++++
 lib/service/servicedvb.cpp                    |  2 +-
 lib/service/servicemp3.cpp                    | 26 ++++++++++++++++++-
 lib/service/servicexine.cpp                   |  2 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 94f2ee38..0372c497 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -696,7 +696,7 @@ RESULT eServiceDVD::setTrickmode(int /*trick*/)
 
 RESULT eServiceDVD::isCurrentlySeekable()
 {
-	return m_state == stRunning;
+	return m_state == stRunning ? 3 : 0;
 }
 
 RESULT eServiceDVD::keyPressed(int key)
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 2cbfeb73..96fcf802 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -690,6 +690,7 @@ class InfoBarSeek:
 				iPlayableService.evEOF: self.__evEOF,
 				iPlayableService.evSOF: self.__evSOF,
 			})
+		self.fast_winding_hint_message_showed = False
 
 		self.minSpeedBackward = useSeekBackHack and 16 or 0
 
@@ -823,6 +824,7 @@ class InfoBarSeek:
 #			print "seekable"
 
 	def __serviceStarted(self):
+		self.fast_winding_hint_message_showed = False
 		self.seekstate = self.SEEK_STATE_PLAY
 		self.__seekableStatusChanged()
 
@@ -913,6 +915,12 @@ class InfoBarSeek:
 			self.showAfterSeek()
 
 	def seekFwd(self):
+		seek = self.getSeek()
+		if seek and (seek.isCurrentlySeekable() & 1) and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed:
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+			return
 		if self.seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateForward(int(config.seek.enter_forward.value)))
 		elif self.seekstate == self.SEEK_STATE_PAUSE:
@@ -942,6 +950,12 @@ class InfoBarSeek:
 			self.setSeekState(self.makeStateSlowMotion(speed))
 
 	def seekBack(self):
+		seek = self.getSeek()
+		if seek and (seek.isCurrentlySeekable() & 1) and not (seek.isCurrentlySeekable() & 2):
+			if not self.fast_winding_hint_message_showed:
+				self.session.open(MessageBox, _("No fast winding possible yet.. but you can use the number buttons to skip forward/backward!"), MessageBox.TYPE_INFO, timeout=10)
+				self.fast_winding_hint_message_showed = True
+			return
 		seekstate = self.seekstate
 		if seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateBackward(int(config.seek.enter_backward.value)))
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp
index 1a28fbdd..ddc675e6 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1370,7 +1370,7 @@ RESULT eDVBServicePlay::setTrickmode(int trick)
 
 RESULT eDVBServicePlay::isCurrentlySeekable()
 {
-	return m_is_pvr || m_timeshift_active;
+	return m_is_pvr || m_timeshift_active ? 3 : 0; // fast forward/backward possible and seeking possible
 }
 
 RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 34d09363..e684e393 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -635,7 +635,31 @@ RESULT eServiceMP3::setTrickmode(int trick)
 
 RESULT eServiceMP3::isCurrentlySeekable()
 {
-	return 1;
+	int ret = 3; // seeking and fast/slow winding possible
+	GstElement *sink;
+
+	if (!m_gst_playbin)
+		return 0;
+	if (m_state != stRunning)
+		return 0;
+
+	g_object_get (G_OBJECT (m_gst_playbin), "video-sink", &sink, NULL);
+
+	// disable fast winding yet when a dvbvideosink or dvbaudiosink is used
+	// for this we must do some changes on different places.. (gstreamer.. our sinks.. enigma2)
+	if (sink) {
+		ret &= ~2; // only seeking possible
+		gst_object_unref(sink);
+	}
+	else {
+		g_object_get (G_OBJECT (m_gst_playbin), "audio-sink", &sink, NULL);
+		if (sink) {
+			ret &= ~2; // only seeking possible
+			gst_object_unref(sink);
+		}
+	}
+
+	return ret;
 }
 
 RESULT eServiceMP3::info(ePtr<iServiceInformation>&i)
diff --git a/lib/service/servicexine.cpp b/lib/service/servicexine.cpp
index 44e6a6e0..6b9adfb9 100644
--- a/lib/service/servicexine.cpp
+++ b/lib/service/servicexine.cpp
@@ -315,7 +315,7 @@ RESULT eServiceXine::setTrickmode(int trick)
 
 RESULT eServiceXine::isCurrentlySeekable()
 {
-	return 1;
+	return 3;
 }
 
 RESULT eServiceXine::info(ePtr<iServiceInformation>&i)
-- 
2.30.2