summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorStefan Sauer <ensonic@users.sf.net>2011-11-17 08:25:28 +0100
committerStefan Sauer <ensonic@users.sf.net>2011-11-17 08:53:23 +0100
commitd2f2955f18567e2562c36912d140ad1534e936b4 (patch)
treeb53070b312fe848d4fbda6d50613e23e5611ba46 /gst
parent6d92ecac757a4e0a9f9f63805b43e26a92bb4160 (diff)
downloadgstreamer-plugins-bad-d2f2955f18567e2562c36912d140ad1534e936b4.tar.gz
collectpads: port API changes
Diffstat (limited to 'gst')
-rw-r--r--gst/asfmux/gstasfmux.c2
-rw-r--r--gst/debugutils/gstcompare.c4
-rw-r--r--gst/frei0r/gstfrei0rmixer.c6
-rw-r--r--gst/mpegpsmux/mpegpsmux.c2
-rw-r--r--gst/mpegtsmux/mpegtsmux.c2
-rw-r--r--gst/mxf/mxfmux.c2
-rw-r--r--gst/videomeasure/gstvideomeasure_ssim.c3
7 files changed, 11 insertions, 10 deletions
diff --git a/gst/asfmux/gstasfmux.c b/gst/asfmux/gstasfmux.c
index bcd8b72b2..42b8b753c 100644
--- a/gst/asfmux/gstasfmux.c
+++ b/gst/asfmux/gstasfmux.c
@@ -2279,7 +2279,7 @@ gst_asf_mux_request_new_pad (GstElement * element,
collect_size = sizeof (GstAsfVideoPad);
}
collect_pad = (GstAsfPad *)
- gst_collect_pads_add_pad_full (asfmux->collect, newpad, collect_size,
+ gst_collect_pads_add_pad (asfmux->collect, newpad, collect_size,
(GstCollectDataDestroyNotify) (gst_asf_mux_pad_reset));
/* set up pad */
diff --git a/gst/debugutils/gstcompare.c b/gst/debugutils/gstcompare.c
index abf563c6c..29feaaa8e 100644
--- a/gst/debugutils/gstcompare.c
+++ b/gst/debugutils/gstcompare.c
@@ -203,9 +203,9 @@ gst_compare_init (GstCompare * comp, GstCompareClass * klass)
gst_pad_set_getcaps_function (comp->checkpad, gst_compare_getcaps);
gst_element_add_pad (GST_ELEMENT (comp), comp->checkpad);
- gst_collect_pads_add_pad_full (comp->cpads, comp->sinkpad,
+ gst_collect_pads_add_pad (comp->cpads, comp->sinkpad,
sizeof (GstCollectData), NULL);
- gst_collect_pads_add_pad_full (comp->cpads, comp->checkpad,
+ gst_collect_pads_add_pad (comp->cpads, comp->checkpad,
sizeof (GstCollectData), NULL);
comp->srcpad = gst_pad_new_from_static_template (&src_factory, "src");
diff --git a/gst/frei0r/gstfrei0rmixer.c b/gst/frei0r/gstfrei0rmixer.c
index bf2983e88..c337e07aa 100644
--- a/gst/frei0r/gstfrei0rmixer.c
+++ b/gst/frei0r/gstfrei0rmixer.c
@@ -731,7 +731,7 @@ gst_frei0r_mixer_init (GstFrei0rMixer * self, GstFrei0rMixerClass * klass)
gst_pad_set_query_function (self->sink0,
GST_DEBUG_FUNCPTR (gst_frei0r_mixer_sink_query));
gst_collect_pads_add_pad (self->collect, self->sink0,
- sizeof (GstCollectData));
+ sizeof (GstCollectData), NULL);
self->collect_event = (GstPadEventFunction) GST_PAD_EVENTFUNC (self->sink0);
gst_pad_set_event_function (self->sink0,
GST_DEBUG_FUNCPTR (gst_frei0r_mixer_sink0_event));
@@ -747,7 +747,7 @@ gst_frei0r_mixer_init (GstFrei0rMixer * self, GstFrei0rMixerClass * klass)
gst_pad_set_query_function (self->sink0,
GST_DEBUG_FUNCPTR (gst_frei0r_mixer_sink_query));
gst_collect_pads_add_pad (self->collect, self->sink1,
- sizeof (GstCollectData));
+ sizeof (GstCollectData), NULL);
gst_element_add_pad (GST_ELEMENT_CAST (self), self->sink1);
if (klass->info->plugin_type == F0R_PLUGIN_TYPE_MIXER3) {
@@ -761,7 +761,7 @@ gst_frei0r_mixer_init (GstFrei0rMixer * self, GstFrei0rMixerClass * klass)
gst_pad_set_query_function (self->sink0,
GST_DEBUG_FUNCPTR (gst_frei0r_mixer_sink_query));
gst_collect_pads_add_pad (self->collect, self->sink2,
- sizeof (GstCollectData));
+ sizeof (GstCollectData), NULL);
gst_element_add_pad (GST_ELEMENT_CAST (self), self->sink2);
}
diff --git a/gst/mpegpsmux/mpegpsmux.c b/gst/mpegpsmux/mpegpsmux.c
index 9398e7a1a..48c0828fb 100644
--- a/gst/mpegpsmux/mpegpsmux.c
+++ b/gst/mpegpsmux/mpegpsmux.c
@@ -539,7 +539,7 @@ mpegpsmux_request_new_pad (GstElement * element,
pad = gst_pad_new_from_template (templ, name);
pad_data = (MpegPsPadData *) gst_collect_pads_add_pad (mux->collect, pad,
- sizeof (MpegPsPadData));
+ sizeof (MpegPsPadData), NULL);
if (pad_data == NULL)
goto pad_failure;
diff --git a/gst/mpegtsmux/mpegtsmux.c b/gst/mpegtsmux/mpegtsmux.c
index 5e942a002..b28ec33d9 100644
--- a/gst/mpegtsmux/mpegtsmux.c
+++ b/gst/mpegtsmux/mpegtsmux.c
@@ -761,7 +761,7 @@ mpegtsmux_request_new_pad (GstElement * element,
g_free (pad_name);
pad_data = (MpegTsPadData *) gst_collect_pads_add_pad (mux->collect, pad,
- sizeof (MpegTsPadData));
+ sizeof (MpegTsPadData), NULL);
if (pad_data == NULL)
goto pad_failure;
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index 6b0e79556..70561a626 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -420,7 +420,7 @@ gst_mxf_mux_request_new_pad (GstElement * element,
pad = gst_pad_new_from_template (templ, name);
g_free (name);
cpad = (GstMXFMuxPad *)
- gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstMXFMuxPad));
+ gst_collect_pads_add_pad (mux->collect, pad, sizeof (GstMXFMuxPad), NULL);
cpad->last_timestamp = 0;
cpad->adapter = gst_adapter_new ();
cpad->writer = writer;
diff --git a/gst/videomeasure/gstvideomeasure_ssim.c b/gst/videomeasure/gstvideomeasure_ssim.c
index 948787a11..9242c002c 100644
--- a/gst/videomeasure/gstvideomeasure_ssim.c
+++ b/gst/videomeasure/gstvideomeasure_ssim.c
@@ -1158,7 +1158,8 @@ gst_ssim_request_new_pad (GstElement * element, GstPadTemplate * templ,
gst_pad_set_getcaps_function (newpad,
GST_DEBUG_FUNCPTR (gst_ssim_sink_getcaps));
gst_pad_set_setcaps_function (newpad, GST_DEBUG_FUNCPTR (gst_ssim_setcaps));
- gst_collect_pads_add_pad (ssim->collect, newpad, sizeof (GstCollectData));
+ gst_collect_pads_add_pad (ssim->collect, newpad, sizeof (GstCollectData),
+ NULL);
/* FIXME: hacked way to override/extend the event function of
* GstCollectPads; because it sets its own event function giving the