diff options
author | Tim-Philipp Müller <tim@centricular.net> | 2005-11-21 12:13:48 +0000 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.net> | 2005-11-21 12:13:48 +0000 |
commit | ded2471f23c6eaa405ad8bb35065c68ed97e06ca (patch) | |
tree | 129f810241472d3df0d008e4946234a756b3863a /gst/smpte | |
parent | 7ab7f62dc2a567664e82b7acfe126e4ba83ea56e (diff) |
Fix for collect pads API change. Also fix textoverlay state change function.
Original commit message from CVS:
* ext/cairo/gsttextoverlay.c: (gst_text_overlay_finalize),
(gst_text_overlay_init), (gst_text_overlay_text_pad_linked),
(gst_text_overlay_text_pad_unlinked), (gst_text_overlay_pop_video),
(gst_text_overlay_pop_text), (gst_text_overlay_collected),
(gst_text_overlay_change_state):
* gst/matroska/matroska-mux.c: (gst_matroska_mux_init),
(gst_matroska_mux_reset), (gst_matroska_mux_request_new_pad),
(gst_matroska_mux_best_pad), (gst_matroska_mux_change_state):
* gst/smpte/gstsmpte.c: (gst_smpte_init), (gst_smpte_collected):
* gst/videomixer/videomixer.c: (gst_videomixer_init),
(gst_videomixer_request_new_pad), (gst_videomixer_fill_queues),
(gst_videomixer_change_state):
Fix for collect pads API change. Also fix textoverlay state
change function.
Diffstat (limited to 'gst/smpte')
-rw-r--r-- | gst/smpte/gstsmpte.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c index 31384ec2..f591d49e 100644 --- a/gst/smpte/gstsmpte.c +++ b/gst/smpte/gstsmpte.c @@ -278,14 +278,14 @@ gst_smpte_init (GstSMPTE * smpte) (&gst_smpte_src_template), "src"); gst_element_add_pad (GST_ELEMENT (smpte), smpte->srcpad); - smpte->collect = gst_collectpads_new (); - gst_collectpads_set_function (smpte->collect, + smpte->collect = gst_collect_pads_new (); + gst_collect_pads_set_function (smpte->collect, (GstCollectPadsFunction) gst_smpte_collected, smpte); - gst_collectpads_start (smpte->collect); + gst_collect_pads_start (smpte->collect); - gst_collectpads_add_pad (smpte->collect, smpte->sinkpad1, + gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad1, sizeof (GstCollectData)); - gst_collectpads_add_pad (smpte->collect, smpte->sinkpad2, + gst_collect_pads_add_pad (smpte->collect, smpte->sinkpad2, sizeof (GstCollectData)); smpte->width = 320; @@ -357,9 +357,9 @@ gst_smpte_collected (GstCollectPads * pads, GstSMPTE * smpte) data = (GstCollectData *) collected->data; if (data->pad == smpte->sinkpad1) - in1 = gst_collectpads_pop (pads, data); + in1 = gst_collect_pads_pop (pads, data); else if (data->pad == smpte->sinkpad2) - in2 = gst_collectpads_pop (pads, data); + in2 = gst_collect_pads_pop (pads, data); } if (in1 == NULL) { |