aggregator: Remove klass->sinkpads_type

This posed problems for the python bindings (and possibly others).

Instead, subclasses now use add_pad_template_with_gtype.

https://bugzilla.gnome.org/show_bug.cgi?id=789986

4 files changed, 8 insertions, 13 deletions

diff --git a/gst/audiomixer/gstaudiointerleave.c b/gst/audiomixer/gstaudiointerleave.c
index fd58e789c..6c7efdd2c 100644
--- a/gst/audiomixer/gstaudiointerleave.c
+++ b/gst/audiomixer/gstaudiointerleave.c
@@ -562,8 +562,8 @@ gst_audio_interleave_class_init (GstAudioInterleaveClass * klass)
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_audio_interleave_src_template);
-  gst_element_class_add_static_pad_template (gstelement_class,
-      &gst_audio_interleave_sink_template);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &gst_audio_interleave_sink_template, GST_TYPE_AUDIO_INTERLEAVE_PAD);
   gst_element_class_set_static_metadata (gstelement_class, "AudioInterleave",
       "Generic/Audio", "Mixes multiple audio streams",
       "Olivier Crete <olivier.crete@collabora.com>");
@@ -573,9 +573,6 @@ gst_audio_interleave_class_init (GstAudioInterleaveClass * klass)
   gstelement_class->release_pad =
       GST_DEBUG_FUNCPTR (gst_audio_interleave_release_pad);
 
-
-  agg_class->sinkpads_type = GST_TYPE_AUDIO_INTERLEAVE_PAD;
-
   agg_class->sink_query = GST_DEBUG_FUNCPTR (gst_audio_interleave_sink_query);
   agg_class->sink_event = GST_DEBUG_FUNCPTR (gst_audio_interleave_sink_event);
   agg_class->stop = gst_audio_interleave_stop;
diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index faae1252f..02737b1f0 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -502,8 +502,8 @@ gst_audiomixer_class_init (GstAudioMixerClass * klass)
 
   gst_element_class_add_static_pad_template (gstelement_class,
       &gst_audiomixer_src_template);
-  gst_element_class_add_static_pad_template (gstelement_class,
-      &gst_audiomixer_sink_template);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &gst_audiomixer_sink_template, GST_TYPE_AUDIO_MIXER_PAD);
   gst_element_class_set_static_metadata (gstelement_class, "AudioMixer",
       "Generic/Audio", "Mixes multiple audio streams",
       "Sebastian Dröge <sebastian@centricular.com>");
@@ -513,8 +513,6 @@ gst_audiomixer_class_init (GstAudioMixerClass * klass)
   gstelement_class->release_pad =
       GST_DEBUG_FUNCPTR (gst_audiomixer_release_pad);
 
-  agg_class->sinkpads_type = GST_TYPE_AUDIO_MIXER_PAD;
-
   agg_class->sink_query = GST_DEBUG_FUNCPTR (gst_audiomixer_sink_query);
   agg_class->sink_event = GST_DEBUG_FUNCPTR (gst_audiomixer_sink_event);
   agg_class->update_src_caps =
diff --git a/gst/compositor/compositor.c b/gst/compositor/compositor.c
index c1954e2a6..2980e5c40 100644
--- a/gst/compositor/compositor.c
+++ b/gst/compositor/compositor.c
@@ -1223,7 +1223,6 @@ gst_compositor_class_init (GstCompositorClass * klass)
   gobject_class->get_property = gst_compositor_get_property;
   gobject_class->set_property = gst_compositor_set_property;
 
-  agg_class->sinkpads_type = GST_TYPE_COMPOSITOR_PAD;
   agg_class->sink_query = _sink_query;
   agg_class->fixate_src_caps = _fixate_caps;
   agg_class->negotiated_src_caps = _negotiated_caps;
@@ -1235,7 +1234,8 @@ gst_compositor_class_init (GstCompositorClass * klass)
           DEFAULT_BACKGROUND, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   gst_element_class_add_static_pad_template (gstelement_class, &src_factory);
-  gst_element_class_add_static_pad_template (gstelement_class, &sink_factory);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &sink_factory, GST_TYPE_COMPOSITOR_PAD);
 
   gst_element_class_set_static_metadata (gstelement_class, "Compositor",
       "Filter/Editor/Video/Compositor",
diff --git a/gst/mxf/mxfmux.c b/gst/mxf/mxfmux.c
index 02a476eb3..2a110824a 100644
--- a/gst/mxf/mxfmux.c
+++ b/gst/mxf/mxfmux.c
@@ -169,9 +169,9 @@ gst_mxf_mux_class_init (GstMXFMuxClass * klass)
   gstaggregator_class->sink_event = GST_DEBUG_FUNCPTR (gst_mxf_mux_sink_event);
   gstaggregator_class->stop = GST_DEBUG_FUNCPTR (gst_mxf_mux_stop);
   gstaggregator_class->aggregate = GST_DEBUG_FUNCPTR (gst_mxf_mux_aggregate);
-  gstaggregator_class->sinkpads_type = GST_TYPE_MXF_MUX_PAD;
 
-  gst_element_class_add_static_pad_template (gstelement_class, &src_templ);
+  gst_element_class_add_static_pad_template_with_gtype (gstelement_class,
+      &src_templ, GST_TYPE_MXF_MUX_PAD);
 
   p = mxf_essence_element_writer_get_pad_templates ();
   while (p && *p) {