From: Felix Domke <tmbinc@elitedvb.net>
Date: Thu, 30 Nov 2006 02:43:16 +0000 (+0000)
Subject: use location for neonhttpsrc
X-Git-Tag: 2.6.0~2641
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/496ab246034f94b00ab437d20e84710c7513511c?ds=sidebyside

use location for neonhttpsrc
---

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 8978f6df..3f6aa30f 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,16 @@ 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");
+
+	if (!source)
+		eWarning("failed to create %s", is_streaming ? "neonhttpsrc" : "filesrc");
+	else
 				/* configure source */
-		g_object_set (G_OBJECT (source), "uri", filename, NULL);
-	}
-		
-	
+		g_object_set (G_OBJECT (source), "location", filename, NULL);
+
 	if (use_decodebin)
 	{
 			/* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */