plugins/elements/: Set the location to NULL if "file://" is set as URI. Otherwise...

Original commit message from CVS:
* plugins/elements/gstfilesink.c: (gst_file_sink_uri_set_uri):
* plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):
Set the location to NULL if "file://" is set as URI. Otherwise
some random previous URI would still be set if "file://" is
set on an already used filesink/filesrc.

diff --git a/ChangeLog b/ChangeLog
index 27d6dd7..9aad6ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        * plugins/elements/gstfilesink.c: (gst_file_sink_uri_set_uri):
        * plugins/elements/gstfilesrc.c: (gst_file_src_uri_set_uri):
+       Set the location to NULL if "file://" is set as URI. Otherwise
+       some random previous URI would still be set if "file://" is
+       set on an already used filesink/filesrc.
+
+2007-04-27  Sebastian Dröge  <slomo@circular-chaos.org>
+
+       * 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.

diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c
index 47650ac..1c59730 100644 (file)
--- a/plugins/elements/gstfilesink.c
+++ b/plugins/elements/gstfilesink.c
@@ -558,6 +558,7 @@ gst_file_sink_uri_set_uri (GstURIHandler * handler, const gchar * uri)
     /* 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. */
+    gst_file_sink_set_location (sink, NULL);
     return TRUE;
   } else {
     location = gst_uri_get_location (uri);

diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index b386462..ceec9e2 100644 (file)
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -1078,6 +1078,7 @@ gst_file_src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
     /* 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. */
+    gst_file_src_set_location (src, NULL);
     return TRUE;
   } else {
     location = gst_uri_get_location (uri);