X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d4f15db8bd37e87b781dbd36879c64618fd18e3a..c1234f5fe6458979d4a7b846383dcadf390d84ea:/lib/service/servicemp3.cpp

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 8978f6df..3d8def57 100644
--- a/lib/service/servicemp3.cpp
+++ b/lib/service/servicemp3.cpp
@@ -127,6 +127,8 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 	int is_video = is_mpeg_ps || is_mpeg_ts;
 	int is_streaming = !strncmp(filename, "http://", 7);
 	
+	eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming);
+	
 	int use_decodebin = !is_video;
 	
 	int all_ok = 0;
@@ -136,22 +138,20 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		eWarning("failed to create pipeline");
 
 	if (!is_streaming)
-	{
 		source = gst_element_factory_make ("filesrc", "file-source");
-		if (!source)
-			eWarning("failed to create filesrc");
-				/* configure source */
-		g_object_set (G_OBJECT (source), "location", filename, NULL);
-	} else
+	else
 	{
 		source = gst_element_factory_make ("neonhttpsrc", "http-source");
-		if (!source)
-			eWarning("failed to create neonhttpsrc");
-				/* configure source */
-		g_object_set (G_OBJECT (source), "uri", filename, NULL);
+		if (source)
+			g_object_set (G_OBJECT (source), "automatic-redirect", TRUE, NULL);
 	}
-		
-	
+
+	if (!source)
+		eWarning("failed to create %s", is_streaming ? "neonhttpsrc" : "filesrc");
+	else
+				/* configure source */
+		g_object_set (G_OBJECT (source), "location", filename, NULL);
+
 	if (use_decodebin)
 	{
 			/* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */
@@ -207,7 +207,13 @@ eServiceMP3::eServiceMP3(const char *filename): m_filename(filename), m_pump(eAp
 		
 		eDebug("audio: %p, queue_audio %p, video %p, queue_video %p, mpegdemux %p", audio, queue_audio, video, queue_video, mpegdemux);
 		if (audio && queue_audio && video && queue_video && mpegdemux)
+		{
+			g_object_set (G_OBJECT (queue_audio), "max-size-buffers", 0, NULL);
+			g_object_set (G_OBJECT (queue_audio), "max-size-time", (guint64)0, NULL);
+			g_object_set (G_OBJECT (queue_video), "max-size-buffers", 0, NULL);
+			g_object_set (G_OBJECT (queue_video), "max-size-time", (guint64)0, NULL);
 			all_ok = 1;
+		}
 	}
 	
 	if (m_gst_pipeline && all_ok)
@@ -570,6 +576,8 @@ void eServiceMP3::gstBusCall(GstBus *bus, GstMessage *msg)
 			m_stream_tags = result;
 		}
 		gst_tag_list_free(tags);
+		
+		m_event((iPlayableService*)this, evUpdatedInfo);
 		break;
 	}
 	default: