From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 30 Dec 2009 16:35:16 +0000 (+0100)
Subject: Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~120
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/699e95c18614b5e6c659a82ae955be6c3920f6e5?hp=b0332cff6d1120f3b84696ce6b33a185bcda88e9

Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental
---

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 58cee9f3..d2c5a795 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -914,7 +914,8 @@ class InfoBarSeek:
 			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
 				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
+				return
+			return 0 # trade as unhandled action
 		if self.seekstate == self.SEEK_STATE_PLAY:
 			self.setSeekState(self.makeStateForward(int(config.seek.enter_forward.value)))
 		elif self.seekstate == self.SEEK_STATE_PAUSE:
@@ -949,7 +950,8 @@ class InfoBarSeek:
 			if not self.fast_winding_hint_message_showed and (seek.isCurrentlySeekable() & 1):
 				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
+				return
+			return 0 # trade as unhandled action
 		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 e6af1e66..602eccfb 100644
--- a/lib/service/servicedvb.cpp
+++ b/lib/service/servicedvb.cpp
@@ -1387,7 +1387,14 @@ RESULT eDVBServicePlay::setTrickmode(int trick)
 
 RESULT eDVBServicePlay::isCurrentlySeekable()
 {
-	return m_is_pvr || m_timeshift_active ? 3 : 0; // fast forward/backward possible and seeking possible
+	int ret = 0;
+	if (m_decoder)
+	{
+		ret = (m_is_pvr || m_timeshift_active) ? 3 : 0; // fast forward/backward possible and seeking possible
+		if (m_decoder->getVideoWidth() == -1)
+			ret &= ~2;
+	}
+	return ret;
 }
 
 RESULT eDVBServicePlay::frontendInfo(ePtr<iFrontendInformation> &ptr)