collectpads: remove gst_collect_pads_add_pad_full

Rename gst_collect_pads_add_pad_full() to gst_collect_pads_add_pad() and fix all
invocations.

diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt
index 5898c38a66f434f38ab0950a10250e2c44fe0675..3a0694e14e69a77122e8a98cb0ba888eb3117dcb 100644 (file)
--- a/docs/libs/gstreamer-libs-sections.txt
+++ b/docs/libs/gstreamer-libs-sections.txt
@@ -645,7 +645,6 @@ GST_COLLECT_PADS_STREAM_UNLOCK
 gst_collect_pads_new
 
 gst_collect_pads_add_pad
-gst_collect_pads_add_pad_full
 gst_collect_pads_remove_pad
 
 gst_collect_pads_start

diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c
index c6962317996d9afdf23697a47d6efdf86b1135dd..610d2d870fdc695f33bba92d45158ce2381bd06e 100644 (file)
--- a/libs/gst/base/gstcollectpads.c
+++ b/libs/gst/base/gstcollectpads.c
@@ -544,37 +544,6 @@ gst_collect_pads_set_clip_function (GstCollectPads * pads,
  * @pads: the collectspads to use
  * @pad: (transfer none): the pad to add
  * @size: the size of the returned #GstCollectData structure
- *
- * Add a pad to the collection of collect pads. The pad has to be
- * a sinkpad. The refcount of the pad is incremented. Use
- * gst_collect_pads_remove_pad() to remove the pad from the collection
- * again.
- *
- * You specify a size for the returned #GstCollectData structure
- * so that you can use it to store additional information.
- *
- * The pad will be automatically activated in push mode when @pads is
- * started.
- *
- * This function calls gst_collect_pads_add_pad_full() passing a value of NULL
- * for destroy_notify and TRUE for locked.
- *
- * MT safe.
- *
- * Returns: a new #GstCollectData to identify the new pad. Or NULL
- *   if wrong parameters are supplied.
- */
-GstCollectData *
-gst_collect_pads_add_pad (GstCollectPads * pads, GstPad * pad, guint size)
-{
-  return gst_collect_pads_add_pad_full (pads, pad, size, NULL, TRUE);
-}
-
-/**
- * gst_collect_pads_add_pad_full:
- * @pads: the collectspads to use
- * @pad: (transfer none): the pad to add
- * @size: the size of the returned #GstCollectData structure
  * @destroy_notify: function to be called before the returned #GstCollectData
  * structure is freed
  * @lock: whether to lock this pad in usual waiting state
@@ -609,8 +578,8 @@ gst_collect_pads_add_pad (GstCollectPads * pads, GstPad * pad, guint size)
  *   if wrong parameters are supplied.
  */
 GstCollectData *
-gst_collect_pads_add_pad_full (GstCollectPads * pads, GstPad * pad,
-    guint size, GstCollectDataDestroyNotify destroy_notify, gboolean lock)
+gst_collect_pads_add_pad (GstCollectPads * pads, GstPad * pad, guint size,
+    GstCollectDataDestroyNotify destroy_notify, gboolean lock)
 {
   GstCollectData *data;
 

diff --git a/libs/gst/base/gstcollectpads.h b/libs/gst/base/gstcollectpads.h
index 220219bb8536a0396163296e36baf49f24889456..ee1c0383079d4d9856f54733fdb6b969f0bb689d 100644 (file)
--- a/libs/gst/base/gstcollectpads.h
+++ b/libs/gst/base/gstcollectpads.h
@@ -313,8 +313,7 @@ void            gst_collect_pads_set_clip_function    (GstCollectPads *pads,
                                                        gpointer user_data);
 
 /* pad management */
-GstCollectData* gst_collect_pads_add_pad       (GstCollectPads *pads, GstPad *pad, guint size);
-GstCollectData* gst_collect_pads_add_pad_full  (GstCollectPads *pads, GstPad *pad, guint size,
+GstCollectData* gst_collect_pads_add_pad       (GstCollectPads *pads, GstPad *pad, guint size,
                                                 GstCollectDataDestroyNotify destroy_notify,
                                                 gboolean lock);
 gboolean        gst_collect_pads_remove_pad    (GstCollectPads *pads, GstPad *pad);

diff --git a/tests/check/libs/collectpads.c b/tests/check/libs/collectpads.c
index 6d6e713ada5dbac2cd2fe4b8085b747c3b8bc2bd..af81847eb54462e97d7c98575900e0e77b0ddc28 100644 (file)
--- a/tests/check/libs/collectpads.c
+++ b/tests/check/libs/collectpads.c
@@ -140,10 +140,10 @@ teardown (void)
 GST_START_TEST (test_pad_add_remove)
 {
   ASSERT_CRITICAL (gst_collect_pads_add_pad (collect, sinkpad1,
-          sizeof (BadCollectData)));
+          sizeof (BadCollectData)), NULL, TRUE);
 
   data1 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad1, sizeof (TestData));
+      sinkpad1, sizeof (TestData), NULL, TRUE);
   fail_unless (data1 != NULL);
 
   fail_unless (gst_collect_pads_remove_pad (collect, sinkpad2) == FALSE);
@@ -158,11 +158,11 @@ GST_START_TEST (test_collect)
   GThread *thread1, *thread2;
 
   data1 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad1, sizeof (TestData));
+      sinkpad1, sizeof (TestData), NULL, TRUE);
   fail_unless (data1 != NULL);
 
   data2 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad2, sizeof (TestData));
+      sinkpad2, sizeof (TestData), NULL, TRUE);
   fail_unless (data2 != NULL);
 
   buf1 = gst_buffer_new ();
@@ -209,11 +209,11 @@ GST_START_TEST (test_collect_eos)
   GThread *thread1, *thread2;
 
   data1 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad1, sizeof (TestData));
+      sinkpad1, sizeof (TestData), NULL, TRUE);
   fail_unless (data1 != NULL);
 
   data2 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad2, sizeof (TestData));
+      sinkpad2, sizeof (TestData), NULL, TRUE);
   fail_unless (data2 != NULL);
 
   buf1 = gst_buffer_new ();
@@ -258,11 +258,11 @@ GST_START_TEST (test_collect_twice)
   GThread *thread1, *thread2;
 
   data1 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad1, sizeof (TestData));
+      sinkpad1, sizeof (TestData), NULL, TRUE);
   fail_unless (data1 != NULL);
 
   data2 = (TestData *) gst_collect_pads_add_pad (collect,
-      sinkpad2, sizeof (TestData));
+      sinkpad2, sizeof (TestData), NULL, TRUE);
   fail_unless (data2 != NULL);
 
   GST_INFO ("round 1");

diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index 1da0fe61b456564079d36ba3e81abd86a593de38..190d5e630d99bdb50376631aefb189412c27b1bb 100644 (file)
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -214,7 +214,6 @@ EXPORTS
        gst_byte_writer_reset_and_get_buffer
        gst_byte_writer_reset_and_get_data
        gst_collect_pads_add_pad
-       gst_collect_pads_add_pad_full
        gst_collect_pads_available
        gst_collect_pads_clip_running_time
        gst_collect_pads_event_default