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.

1 files changed, 6 insertions, 6 deletions

diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c
index 8c8c978b..ddae8310 100644
--- a/gst/videomixer/videomixer.c
+++ b/gst/videomixer/videomixer.c
@@ -490,14 +490,14 @@ gst_videomixer_init (GstVideoMixer * mix)
   gst_pad_set_getcaps_function (GST_PAD (mix->srcpad), gst_videomixer_getcaps);
   gst_element_add_pad (GST_ELEMENT (mix), mix->srcpad);
 
-  mix->collect = gst_collectpads_new ();
+  mix->collect = gst_collect_pads_new ();
   mix->background = DEFAULT_BACKGROUND;
   mix->in_width = 0;
   mix->in_height = 0;
   mix->out_width = 0;
   mix->out_height = 0;
 
-  gst_collectpads_set_function (mix->collect,
+  gst_collect_pads_set_function (mix->collect,
       (GstCollectPadsFunction) gst_videomixer_collected, mix);
 }
 
@@ -572,7 +572,7 @@ gst_videomixer_request_new_pad (GstElement * element,
     mixpad->alpha = DEFAULT_PAD_ALPHA;
 
     mixcol = (GstVideoMixerCollect *)
-        gst_collectpads_add_pad (mix->collect, GST_PAD (mixpad),
+        gst_collect_pads_add_pad (mix->collect, GST_PAD (mixpad),
         sizeof (GstVideoMixerCollect));
 
     /* Keep track of eachother */
@@ -885,7 +885,7 @@ gst_videomixer_fill_queues (GstVideoMixer * mix)
 
       GST_LOG ("we need a new buffer");
 
-      buf = gst_collectpads_pop (mix->collect, data);
+      buf = gst_collect_pads_pop (mix->collect, data);
 
       if (buf) {
         guint64 duration;
@@ -1175,11 +1175,11 @@ gst_videomixer_change_state (GstElement * element, GstStateChange transition)
   switch (transition) {
     case GST_STATE_CHANGE_READY_TO_PAUSED:
       GST_LOG ("starting collectpads");
-      gst_collectpads_start (mix->collect);
+      gst_collect_pads_start (mix->collect);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
       GST_LOG ("stopping collectpads");
-      gst_collectpads_stop (mix->collect);
+      gst_collect_pads_stop (mix->collect);
       break;
     default:
       break;