gst/gstqueue.c: use gst_pad_proxy_getcaps()

Original commit message from CVS:
2003-12-31  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* gst/gstqueue.c: (gst_queue_init):
use gst_pad_proxy_getcaps()

diff --git a/ChangeLog b/ChangeLog
index 4c3d09b0ecd482e1add6dac99bfcf0fef8244845..ca0b493d89ad386845ff687611ca5f57a4df4170 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-31  Ronald Bultje  <rbultje@ronald.bitfreak.net>
+
+       * gst/gstqueue.c: (gst_queue_init):
+         use gst_pad_proxy_getcaps()
+
 2003-12-31  David Schleef  <ds@schleef.org>
 
        * gst/elements/gstshaper.c: (gst_shaper_link):

diff --git a/gst/gstqueue.c b/gst/gstqueue.c
index d00ca1d403eaac127a538a027cd233703cee76bb..46c0cf100a2acfb52234868bc999c029d811c41f 100644 (file)
--- a/gst/gstqueue.c
+++ b/gst/gstqueue.c
@@ -83,7 +83,6 @@ static void   gst_queue_get_property          (GObject       *object,
                                                 GValue        *value,
                                                 GParamSpec    *pspec);
 
-static GstCaps *gst_queue_getcaps              (GstPad        *pad);
 static GstPadLinkReturn
                gst_queue_link                  (GstPad        *pad,
                                                 const GstCaps *caps);
@@ -252,14 +251,14 @@ gst_queue_init (GstQueue *queue)
   gst_pad_set_chain_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_chain));
   gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad);
   gst_pad_set_link_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_link));
-  gst_pad_set_getcaps_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_getcaps));
+  gst_pad_set_getcaps_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
   gst_pad_set_active (queue->sinkpad, TRUE);
 
   queue->srcpad = gst_pad_new ("src", GST_PAD_SRC);
   gst_pad_set_get_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_get));
   gst_element_add_pad (GST_ELEMENT (queue), queue->srcpad);
   gst_pad_set_link_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_link));
-  gst_pad_set_getcaps_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_getcaps));
+  gst_pad_set_getcaps_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
   gst_pad_set_event_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_handle_src_event));
   gst_pad_set_active (queue->srcpad, TRUE);
 
@@ -335,17 +334,6 @@ gst_queue_link (GstPad  *pad, const GstCaps *caps)
   return gst_pad_try_set_caps (gst_queue_otherpad (pad), caps);
 }
 
-static GstCaps *
-gst_queue_getcaps (GstPad  *pad)
-{
-  GstPad *otherpad = GST_PAD_PEER (gst_queue_otherpad (pad));
-
-  if (otherpad)
-    return gst_pad_get_caps (otherpad);
-
-  return gst_caps_new_any ();
-}
-
 static void
 gst_queue_locked_flush (GstQueue *queue)
 {

diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c
index d00ca1d403eaac127a538a027cd233703cee76bb..46c0cf100a2acfb52234868bc999c029d811c41f 100644 (file)
--- a/plugins/elements/gstqueue.c
+++ b/plugins/elements/gstqueue.c
@@ -83,7 +83,6 @@ static void   gst_queue_get_property          (GObject       *object,
                                                 GValue        *value,
                                                 GParamSpec    *pspec);
 
-static GstCaps *gst_queue_getcaps              (GstPad        *pad);
 static GstPadLinkReturn
                gst_queue_link                  (GstPad        *pad,
                                                 const GstCaps *caps);
@@ -252,14 +251,14 @@ gst_queue_init (GstQueue *queue)
   gst_pad_set_chain_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_chain));
   gst_element_add_pad (GST_ELEMENT (queue), queue->sinkpad);
   gst_pad_set_link_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_link));
-  gst_pad_set_getcaps_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_queue_getcaps));
+  gst_pad_set_getcaps_function (queue->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
   gst_pad_set_active (queue->sinkpad, TRUE);
 
   queue->srcpad = gst_pad_new ("src", GST_PAD_SRC);
   gst_pad_set_get_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_get));
   gst_element_add_pad (GST_ELEMENT (queue), queue->srcpad);
   gst_pad_set_link_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_link));
-  gst_pad_set_getcaps_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_getcaps));
+  gst_pad_set_getcaps_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps));
   gst_pad_set_event_function (queue->srcpad, GST_DEBUG_FUNCPTR (gst_queue_handle_src_event));
   gst_pad_set_active (queue->srcpad, TRUE);
 
@@ -335,17 +334,6 @@ gst_queue_link (GstPad  *pad, const GstCaps *caps)
   return gst_pad_try_set_caps (gst_queue_otherpad (pad), caps);
 }
 
-static GstCaps *
-gst_queue_getcaps (GstPad  *pad)
-{
-  GstPad *otherpad = GST_PAD_PEER (gst_queue_otherpad (pad));
-
-  if (otherpad)
-    return gst_pad_get_caps (otherpad);
-
-  return gst_caps_new_any ();
-}
-
 static void
 gst_queue_locked_flush (GstQueue *queue)
 {