Commit f874922e authored by Stefan Sauer's avatar Stefan Sauer

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.
parent d6ca569c
......@@ -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, TRUE);
/* 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, TRUE);
}
overlay->need_render = TRUE;
......
......@@ -968,7 +968,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, TRUE);
((GstAviCollectData *) (avipad->collect))->avipad = avipad;
if (!gst_element_add_pad (element, newpad))
......
......@@ -572,8 +572,8 @@ 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));
cpad = (GstFlvPad *) gst_collect_pads_add_pad (mux->collect, pad,
sizeof (GstFlvPad), NULL, TRUE);
cpad->audio_codec_data = NULL;
cpad->video_codec_data = NULL;
......
......@@ -481,7 +481,8 @@ gst_interleave_request_new_pad (GstElement * element, GstPadTemplate * templ,
gst_pad_use_fixed_caps (new_pad);
gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData));
gst_collect_pads_add_pad (self->collect, new_pad, sizeof (GstCollectData),
NULL, TRUE);
gst_collect_pads_set_event_function (self->collect,
(GstCollectPadsEventFunction)
......
......@@ -3402,7 +3402,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), TRUE);
/* set up pad */
gst_qt_mux_pad_reset (collect_pad);
......
......@@ -2144,7 +2144,7 @@ gst_matroska_mux_request_new_pad (GstElement * element,
gst_matroskamux_pad_init (newpad);
collect_pad = (GstMatroskaPad *)
gst_collect_pads_add_pad_full (mux->collect, GST_PAD (newpad),
gst_collect_pads_add_pad (mux->collect, GST_PAD (newpad),
sizeof (GstMatroskamuxPad),
(GstCollectDataDestroyNotify) gst_matroska_pad_free, locked);
......
......@@ -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, TRUE);
/* save a pointer to our data in the pad */
multipartpad->pad = newpad;
......
......@@ -356,9 +356,9 @@ gst_smpte_init (GstSMPTE * smpte)
GST_DEBUG_FUNCPTR (gst_smpte_sink_event), smpte);
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1,
sizeof (GstCollectData));
sizeof (GstCollectData), NULL, TRUE);
gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2,
sizeof (GstCollectData));
sizeof (GstCollectData), NULL, TRUE);
smpte->type = DEFAULT_PROP_TYPE;
smpte->border = DEFAULT_PROP_BORDER;
......
......@@ -1797,7 +1797,7 @@ gst_videomixer2_request_new_pad (GstElement * element,
mixpad->alpha = DEFAULT_PAD_ALPHA;
mixcol = (GstVideoMixer2Collect *)
gst_collect_pads_add_pad_full (mix->collect, GST_PAD (mixpad),
gst_collect_pads_add_pad (mix->collect, GST_PAD (mixpad),
sizeof (GstVideoMixer2Collect),
(GstCollectDataDestroyNotify) gst_videomixer2_collect_free, TRUE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment