use location for neonhttpsrc

diff --git a/lib/service/servicemp3.cpp b/lib/service/servicemp3.cpp
index 8978f6dfdd05c9f3a0befa9b2620ba1a4bda9a9c..3f6aa30ff66d1e20eb7c327455731b04c541e9dc 100644 (file)
--- 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);
        
        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;
        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)
                eWarning("failed to create pipeline");
 
        if (!is_streaming)

-       {

                source = gst_element_factory_make ("filesrc", "file-source");
                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");
                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 */
                                /* 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 */
        if (use_decodebin)
        {
                        /* filesrc -> decodebin -> audioconvert -> capsfilter -> alsasink */