[gst-cvs] slomo gstreamer: gstreamer/ gstreamer/plugins/elements/

[<sl...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     slomo
Date:           Fri Apr 27 2007  07:27:48 UTC

Log message:
* plugins/elements/gstfilesink.c: (gst_file_sink_uri_set_uri):
* plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):
Special case the "file://" URI as as this is used by some
applications to test with gst_element_make_from_uri if there's
an element that supports the URI protocol.
Also move the g_path_is_absolute() check for the location part
of the URI to also check this for "file://localhost/bla" URIs.

Modified files:
    .               : ChangeLog
    plugins/elements: gstfilesink.c gstfilesrc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3179&r2=1.3180
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfilesink.c.diff?r1=1.84&r2=1.85
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/plugins/elements/gstfilesrc.c.diff?r1=1.150&r2=1.151

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.3179
retrieving revision 1.3180
diff -u -d -r1.3179 -r1.3180
--- ChangeLog	26 Apr 2007 10:00:48 -0000	1.3179
+++ ChangeLog	27 Apr 2007 07:27:35 -0000	1.3180
@@ -1,3 +1,13 @@
+2007-04-27  Sebastian Dröge  <sl...@ci...>
+
+	* plugins/elements/gstfilesink.c: (gst_file_sink_uri_set_uri):
+	* plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):
+	Special case the "file://" URI as as this is used by some
+	applications to test with gst_element_make_from_uri if there's
+	an element that supports the URI protocol.
+	Also move the g_path_is_absolute() check for the location part
+	of the URI to also check this for "file://localhost/bla" URIs.
 2007-04-26  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* docs/gst/gstreamer-sections.txt:
Index: gstfilesink.c
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfilesink.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- gstfilesink.c	13 Feb 2007 13:40:05 -0000	1.84
+++ gstfilesink.c	27 Apr 2007 07:27:36 -0000	1.85
@@ -554,14 +554,20 @@
      * "location" with uri + 16 because it provides unescaping */
     location = gst_uri_get_location (tmp);
     g_free (tmp);
+  } else if (strcmp (uri, "file://") == 0) {
+    /* Special case for "file://" as this is used by some applications
+     *  to test with gst_element_make_from_uri if there's an element
+     *  that supports the URI protocol. */
+    return TRUE;
   } else {
     location = gst_uri_get_location (uri);
-    if (!location)
-      return FALSE;
-    if (!g_path_is_absolute (location)) {
-      g_free (location);
-    }
+  }
+  if (!location)
+    return FALSE;
+  if (!g_path_is_absolute (location)) {
+    g_free (location);
   }
   ret = gst_file_sink_set_location (sink, location);
Index: gstfilesrc.c
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstfilesrc.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- gstfilesrc.c	13 Feb 2007 13:40:05 -0000	1.150
+++ gstfilesrc.c	27 Apr 2007 07:27:36 -0000	1.151
@@ -1074,14 +1074,20 @@
   ret = gst_file_src_set_location (src, location);