From: ghost <andreas.monzner@multimedia-labs.de>
Date: Fri, 6 Nov 2009 10:44:06 +0000 (+0100)
Subject: Revert "disable fast winding for non TS mediafiles until we have a usable solution... 
X-Git-Tag: 3.0.0~28^2~66^2~212
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/37e3c1814cc8ea6ef4eaef9a4bbc5d757d98972f?hp=e66d0ee5f86946cf2d0c3dc5a0ea369917e0cfd3

Revert "disable fast winding for non TS mediafiles until we have a usable solution for this.."

This reverts commit b643641e2c6288eff61d0346a3dda82bd820b3b7.
---

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 0372c497..94f2ee38 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 ? 3 : 0;
+	return m_state == stRunning;
 }
 
 RESULT eServiceDVD::keyPressed(int key)
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 9a6a099c..b98cd469 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -691,7 +691,6 @@ class InfoBarSeek:
 				iPlayableService.evEOF: self.__evEOF,
 				iPlayableService.evSOF: self.__evSOF,
 			})
-		self.fast_winding_hint_message_showed = False
 
 		class InfoBarSeekActionMap(HelpableActionMap):
 			def __init__(self, screen, *args, **kwargs):
@@ -818,7 +817,6 @@ class InfoBarSeek:
 #			print "seekable"
 
 	def __serviceStarted(self):
-		self.fast_winding_hint_message_showed = False
 		self.seekstate = self.SEEK_STATE_PLAY
 		self.__seekableStatusChanged()
 
@@ -909,12 +907,6 @@ 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:
@@ -944,12 +936,6 @@ 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 ddc675e6..1a28fbdd 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 ? 3 : 0; // fast forward/backward possible and seeking possible
+	return m_is_pvr || m_timeshift_active;
 }
 
 RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)
diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 52f2bc99..c95609a3 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -641,31 +641,7 @@ RESULT eServiceMP3::setTrickmode(int trick)
 
 RESULT eServiceMP3::isCurrentlySeekable()
 {
-	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;
+	return 1;
 }
 
 RESULT eServiceMP3::info(ePtr<iServiceInformation>&i)
diff --git a/lib/service/servicexine.cpp b/lib/service/servicexine.cpp
index 6b9adfb9..44e6a6e0 100644
--- a/lib/service/servicexine.cpp
+++ b/lib/service/servicexine.cpp
@@ -315,7 +315,7 @@ RESULT eServiceXine::setTrickmode(int trick)
 
 RESULT eServiceXine::isCurrentlySeekable()
 {
-	return 3;
+	return 1;
 }
 
 RESULT eServiceXine::info(ePtr<iServiceInformation>&i)