X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/91325961f07c9285bc778c1b413c1714def4b47a..720812b388b0c6cb14a175957ff4017ea8af07e2:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index d3eaa262..50b02efd 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -46,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);
 	}
 
@@ -189,6 +190,25 @@ int eStaticServiceMP3Info::getLength(const eServiceReference &ref)
 	return -1;
 }
 
+int eStaticServiceMP3Info::getInfo(const eServiceReference &ref, int w)
+{
+	switch (w)
+	{
+	case iServiceInformation::sTimeCreate:
+	{
+		struct stat s;
+		if(stat(ref.path.c_str(), &s) == 0)
+		{
+		  return s.st_mtime;
+		}
+		return iServiceInformation::resNA;
+	}
+	default: break;
+	}
+	return iServiceInformation::resNA;
+}
+ 
+
 // eServiceMP3
 int eServiceMP3::ac3_delay,
     eServiceMP3::pcm_delay;
@@ -283,11 +303,11 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		if ( ret == -1 ) // this is a "REAL" VCD
 			uri = g_strdup_printf ("vcd://");
 		else
-			uri = g_strdup_printf ("file://%s", filename);
+			uri = g_filename_to_uri(filename, NULL, NULL);
 	}
 	else
 
-		uri = g_strdup_printf ("file://%s", filename);
+		uri = g_filename_to_uri(filename, NULL, NULL);
 
 	eDebug("eServiceMP3::playbin2 uri=%s", uri);
 
@@ -308,6 +328,7 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 	else
 	{
 		m_subs_to_pull_handler_id = g_signal_connect (subsink, "new-buffer", G_CALLBACK (gstCBsubtitleAvail), this);
+		g_object_set (G_OBJECT (subsink), "caps", gst_caps_from_string("text/x-plain; text/x-pango-markup"), NULL);
 		g_object_set (G_OBJECT (m_gst_playbin), "text-sink", subsink, NULL);
 	}
 
@@ -321,9 +342,8 @@ eServiceMP3::eServiceMP3(eServiceReference ref)
 		struct stat buffer;
 		if (stat(srt_filename, &buffer) == 0)
 		{
-			std::string suburi = "file://" + (std::string)srt_filename;
-			eDebug("eServiceMP3::subtitle uri: %s",suburi.c_str());
-			g_object_set (G_OBJECT (m_gst_playbin), "suburi", suburi.c_str(), NULL);
+			eDebug("eServiceMP3::subtitle uri: %s", g_filename_to_uri(srt_filename, NULL, NULL));
+			g_object_set (G_OBJECT (m_gst_playbin), "suburi", g_filename_to_uri(srt_filename, NULL, NULL), NULL);
 			subtitleStream subs;
 			subs.type = stSRT;
 			subs.language_code = std::string("und");
@@ -640,7 +660,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)