slomo gst-plugins-base: gst-plugins-base/ gst-plugins-base/ext/gio/ gst-plugins-base/ext/gnomevfs/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     slomo
Date:           Sat Dec 20 2008  17:38:55 UTC

Log message:
* ext/gio/gstgiobasesink.c: (gst_gio_base_sink_query):
* ext/gio/gstgiobasesrc.c: (gst_gio_base_src_class_init),
(gst_gio_base_src_query):
* ext/gnomevfs/gstgnomevfssink.c: (gst_gnome_vfs_sink_query):
* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnome_vfs_src_class_init),
(gst_gnome_vfs_src_query):
Implement URI query. Fixes bug #562949.

Modified files:
    .               : ChangeLog
    ext/gio         : gstgiobasesink.c gstgiobasesrc.c
    ext/gnomevfs    : gstgnomevfssink.c gstgnomevfssrc.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4261&r2=1.4262
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gio/gstgiobasesink.c.diff?r1=1.4&r2=1.5
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gio/gstgiobasesrc.c.diff?r1=1.10&r2=1.11
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssink.c.diff?r1=1.48&r2=1.49
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c.diff?r1=1.108&r2=1.109

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4261
retrieving revision 1.4262
diff -u -d -r1.4261 -r1.4262
--- ChangeLog	20 Dec 2008 12:48:41 -0000	1.4261
+++ ChangeLog	20 Dec 2008 17:38:39 -0000	1.4262
@@ -1,3 +1,13 @@
+2008-12-20  Sebastian Dröge  <[email protected]>
+
+	* ext/gio/gstgiobasesink.c: (gst_gio_base_sink_query):
+	* ext/gio/gstgiobasesrc.c: (gst_gio_base_src_class_init),
+	(gst_gio_base_src_query):
+	* ext/gnomevfs/gstgnomevfssink.c: (gst_gnome_vfs_sink_query):
+	* ext/gnomevfs/gstgnomevfssrc.c: (gst_gnome_vfs_src_class_init),
+	(gst_gnome_vfs_src_query):
+	Implement URI query. Fixes bug #562949.
 2008-12-20  Wim Taymans  <[email protected]>
 
 	* gst/playback/gstplaybin2.c: (no_more_pads_cb):
Index: gstgiobasesink.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgiobasesink.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gstgiobasesink.c	17 Feb 2008 05:15:45 -0000	1.4
+++ gstgiobasesink.c	20 Dec 2008 17:38:41 -0000	1.5
@@ -308,6 +308,15 @@
     case GST_QUERY_FORMATS:
       gst_query_set_formats (query, 2, GST_FORMAT_DEFAULT, GST_FORMAT_BYTES);
       return TRUE;
+    case GST_QUERY_URI:
+      if (GST_IS_URI_HANDLER (sink)) {
+        const gchar *uri;
+        uri = gst_uri_handler_get_uri (GST_URI_HANDLER (sink));
+        gst_query_set_uri (query, uri);
+        return TRUE;
+      }
+      return FALSE;
     default:
       return gst_pad_query_default (pad, query);
   }
Index: gstgiobasesrc.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gio/gstgiobasesrc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gstgiobasesrc.c	24 Nov 2008 12:07:10 -0000	1.10
+++ gstgiobasesrc.c	20 Dec 2008 17:38:41 -0000	1.11
@@ -39,21 +39,17 @@
 static void gst_gio_base_src_finalize (GObject * object);
 static gboolean gst_gio_base_src_start (GstBaseSrc * base_src);
-
 static gboolean gst_gio_base_src_stop (GstBaseSrc * base_src);
 static gboolean gst_gio_base_src_get_size (GstBaseSrc * base_src,
     guint64 * size);
 static gboolean gst_gio_base_src_is_seekable (GstBaseSrc * base_src);
 static gboolean gst_gio_base_src_unlock (GstBaseSrc * base_src);
 static gboolean gst_gio_base_src_unlock_stop (GstBaseSrc * base_src);
 static gboolean gst_gio_base_src_check_get_range (GstBaseSrc * base_src);
 static GstFlowReturn gst_gio_base_src_create (GstBaseSrc * base_src,
     guint64 offset, guint size, GstBuffer ** buf);
+static gboolean gst_gio_base_src_query (GstBaseSrc * base_src,
+    GstQuery * query);
 static void
 gst_gio_base_src_base_init (gpointer gclass)
@@ -93,6 +89,7 @@
   gstbasesrc_class->check_get_range =
       GST_DEBUG_FUNCPTR (gst_gio_base_src_check_get_range);
   gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_gio_base_src_create);
+  gstbasesrc_class->query = GST_DEBUG_FUNCPTR (gst_gio_base_src_query);
 }
@@ -431,6 +428,31 @@
   return ret;
+static gboolean
+gst_gio_base_src_query (GstBaseSrc * base_src, GstQuery * query)
+{
+  gboolean ret = FALSE;
+  GstGioBaseSrc *src = GST_GIO_BASE_SRC (base_src);
+  switch (GST_QUERY_TYPE (query)) {
+      if (GST_IS_URI_HANDLER (src)) {
+        const gchar *uri = gst_uri_handler_get_uri (GST_URI_HANDLER (src));
+        ret = TRUE;
+      break;
+    default:
+      ret = FALSE;
+  }
+  if (!ret)
+    ret = GST_BASE_SRC_CLASS (parent_class)->query (base_src, query);
+  return ret;
+}
 void
 gst_gio_base_src_set_stream (GstGioBaseSrc * src, GInputStream * stream)
 {
Index: gstgnomevfssink.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssink.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gstgnomevfssink.c	10 Jul 2008 21:05:57 -0000	1.48
+++ gstgnomevfssink.c	20 Dec 2008 17:38:41 -0000	1.49
@@ -511,6 +511,10 @@
+      gst_query_set_uri (query, sink->uri_name);
+      return TRUE;
Index: gstgnomevfssrc.c
RCS file: /cvs/gstreamer/gst-plugins-base/ext/gnomevfs/gstgnomevfssrc.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- gstgnomevfssrc.c	24 Nov 2008 12:07:10 -0000	1.108
+++ gstgnomevfssrc.c	20 Dec 2008 17:38:41 -0000	1.109
@@ -141,6 +141,7 @@
 static gboolean gst_gnome_vfs_src_get_size (GstBaseSrc * src, guint64 * size);
 static GstFlowReturn gst_gnome_vfs_src_create (GstBaseSrc * basesrc,
     guint64 offset, guint size, GstBuffer ** buffer);
+static gboolean gst_gnome_vfs_src_query (GstBaseSrc * src, GstQuery * query);
 static GstElementClass *parent_class = NULL;
@@ -249,6 +250,7 @@
       GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_check_get_range);
   gstbasesrc_class->create = GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_create);
+  gstbasesrc_class->query = GST_DEBUG_FUNCPTR (gst_gnome_vfs_src_query);
@@ -691,6 +693,28 @@
 static gboolean
+gst_gnome_vfs_src_query (GstBaseSrc * basesrc, GstQuery * query)
+  GstGnomeVFSSrc *src = GST_GNOME_VFS_SRC (basesrc);
+      gst_query_set_uri (query, src->uri_name);
+      ret = TRUE;
+    ret = GST_BASE_SRC_CLASS (parent_class)->query (basesrc, query);
 gst_gnome_vfs_src_is_seekable (GstBaseSrc * basesrc)
   GstGnomeVFSSrc *src;

------------------------------------------------------------------------------

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose