collectpads: port API changes

diff --git a/ext/cairo/gsttextoverlay.c b/ext/cairo/gsttextoverlay.c
index 3f4fe3a..839d9da 100644 (file)
--- a/ext/cairo/gsttextoverlay.c
+++ b/ext/cairo/gsttextoverlay.c
@@ -285,7 +285,7 @@ gst_text_overlay_init (GstCairoTextOverlay * overlay,
       GST_DEBUG_FUNCPTR (gst_text_overlay_collected), overlay);
 
   overlay->video_collect_data = gst_collect_pads_add_pad (overlay->collect,
-      overlay->video_sinkpad, sizeof (GstCollectData));
+      overlay->video_sinkpad, sizeof (GstCollectData), NULL);
 
   /* FIXME: hacked way to override/extend the event function of
    * GstCollectPads; because it sets its own event function giving the
@@ -641,7 +641,7 @@ gst_text_overlay_text_pad_linked (GstPad * pad, GstPad * peer)
 
   if (overlay->text_collect_data == NULL) {
     overlay->text_collect_data = gst_collect_pads_add_pad (overlay->collect,
-        overlay->text_sinkpad, sizeof (GstCollectData));
+        overlay->text_sinkpad, sizeof (GstCollectData), NULL);
   }
 
   overlay->need_render = TRUE;

diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 6e27349..ee099c0 100644 (file)
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -977,7 +977,7 @@ gst_avi_mux_request_new_pad (GstElement * element,
   g_free (name);
 
   avipad->collect = gst_collect_pads_add_pad (avimux->collect,
-      newpad, sizeof (GstAviCollectData));
+      newpad, sizeof (GstAviCollectData), NULL);
   ((GstAviCollectData *) (avipad->collect))->avipad = avipad;
   /* FIXME: hacked way to override/extend the event function of
    * GstCollectPads; because it sets its own event function giving the

diff --git a/gst/flv/gstflvmux.c b/gst/flv/gstflvmux.c
index 9efd60b..b8bf914 100644 (file)
--- a/gst/flv/gstflvmux.c
+++ b/gst/flv/gstflvmux.c
@@ -565,7 +565,7 @@ gst_flv_mux_request_new_pad (GstElement * element,
 
   pad = gst_pad_new_from_template (templ, name);
   cpad = (GstFlvPad *)
-      gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstFlvPad));
+      gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstFlvPad), NULL);
 
   cpad->audio_codec_data = NULL;
   cpad->video_codec_data = NULL;

diff --git a/gst/interleave/interleave.c b/gst/interleave/interleave.c
index e5bb949..f5d6004 100644 (file)
--- a/gst/interleave/interleave.c
+++ b/gst/interleave/interleave.c
@@ -500,7 +500,8 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
   gst_pad_set_getcaps_function (new_pad,
       GST_DEBUG_FUNCPTR (gst_interleave_sink_getcaps));
 
-  gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData));
+  gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData),
+      NULL);
 
   /* FIXME: hacked way to override/extend the event function of
    * GstCollectPads; because it sets its own event function giving the

diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c
index c3d172a..ba29862 100644 (file)
--- a/gst/isomp4/gstqtmux.c
+++ b/gst/isomp4/gstqtmux.c
@@ -3418,7 +3418,7 @@ gst_qt_mux_request_new_pad (GstElement * element,
   newpad = gst_pad_new_from_template (templ, name);
   g_free (name);
   collect_pad = (GstQTPad *)
-      gst_collect_pads_add_pad_full (qtmux->collect, newpad, sizeof (GstQTPad),
+      gst_collect_pads_add_pad (qtmux->collect, newpad, sizeof (GstQTPad),
       (GstCollectDataDestroyNotify) (gst_qt_mux_pad_reset));
   /* set up pad */
   gst_qt_mux_pad_reset (collect_pad);

diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c
index d48d56c..06e7d42 100644 (file)
--- a/gst/matroska/matroska-mux.c
+++ b/gst/matroska/matroska-mux.c
@@ -1901,7 +1901,7 @@ gst_matroska_mux_request_new_pad (GstElement * element,
   newpad = gst_pad_new_from_template (templ, pad_name);
   g_free (name);
   collect_pad = (GstMatroskaPad *)
-      gst_collect_pads_add_pad_full (mux->collect, newpad,
+      gst_collect_pads_add_pad (mux->collect, newpad,
       sizeof (GstMatroskaPad),
       (GstCollectDataDestroyNotify) gst_matroska_pad_free);
 

diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index 94d6264..5ae7cca 100644 (file)
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -195,7 +195,7 @@ gst_multipart_mux_request_new_pad (GstElement * element,
 
     multipartpad = (GstMultipartPadData *)
         gst_collect_pads_add_pad (multipart_mux->collect, newpad,
-        sizeof (GstMultipartPadData));
+        sizeof (GstMultipartPadData), NULL);
 
     /* save a pointer to our data in the pad */
     multipartpad->pad = newpad;

diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index ce83234..a830e6a 100644 (file)
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -366,9 +366,9 @@ gst_smpte_init (GstSMPTE * smpte)
   gst_collect_pads_start (smpte->collect);
 
   gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1,
-      sizeof (GstCollectData));
+      sizeof (GstCollectData), NULL);
   gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2,
-      sizeof (GstCollectData));
+      sizeof (GstCollectData), NULL);
 
   smpte->fps = DEFAULT_PROP_FPS;
   smpte->type = DEFAULT_PROP_TYPE;

diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 9b89e82..ae0a538 100644 (file)
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -1231,7 +1231,7 @@ gst_videomixer_request_new_pad (GstElement * element,
 
     mixcol = (GstVideoMixerCollect *)
         gst_collect_pads_add_pad (mix->collect, GST_PAD (mixpad),
-        sizeof (GstVideoMixerCollect));
+        sizeof (GstVideoMixerCollect), NULL);
 
     /* FIXME: hacked way to override/extend the event function of
      * GstCollectPads; because it sets its own event function giving the