X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9ec56f0aae40fe0c4afb071df436eacf79ac10af..a7ed9db9532b7ac58dc3b923c0e3f9ee1789ddeb:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index f74bc5ee..c0ae42fd 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -37,6 +37,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("vob");
 		extensions.push_back("wav");
 		extensions.push_back("wave");
+		extensions.push_back("m4v");
 		extensions.push_back("mkv");
 		extensions.push_back("avi");
 		extensions.push_back("divx");
@@ -45,6 +46,7 @@ eServiceFactoryMP3::eServiceFactoryMP3()
 		extensions.push_back("mp4");
 		extensions.push_back("mov");
 		extensions.push_back("m4a");
+		extensions.push_back("m2ts");
 		sc->addServiceFactory(eServiceFactoryMP3::id, this, extensions);
 	}
 
@@ -240,7 +242,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		sourceinfo.containertype = ctAVI;
 		sourceinfo.is_video = TRUE;
 	}
-	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0)
+	else if ( strcasecmp(ext, ".mp4") == 0 || strcasecmp(ext, ".mov") == 0 || strcasecmp(ext, ".m4v") == 0)
 	{
 		sourceinfo.containertype = ctMP4;
 		sourceinfo.is_video = TRUE;
@@ -639,7 +641,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)