From 9e4b3fbd827977e04ea19dbbe0c0051771ad4c09 Mon Sep 17 00:00:00 2001 From: Mathieu Duponchelle Date: Mon, 6 Nov 2017 21:07:51 +0100 Subject: [PATCH] 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 --- gst/audiomixer/gstaudiointerleave.c | 7 ++----- gst/audiomixer/gstaudiomixer.c | 6 ++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/gst/audiomixer/gstaudiointerleave.c b/gst/audiomixer/gstaudiointerleave.c index fd58e789c6..6c7efdd2c4 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 "); @@ -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 faae1252fd..02737b1f02 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 "); @@ -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 =