From aa69de7514ac94d3da00b524e217faa81901fbce Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 21 Oct 2014 11:01:17 +0200 Subject: [PATCH] ges: Use audiomixer instead of adder by default --- ges/ges-audio-transition.c | 2 +- ges/ges-smart-adder.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ges/ges-audio-transition.c b/ges/ges-audio-transition.c index 4b6dd7b916..8d5c297ecf 100644 --- a/ges/ges-audio-transition.c +++ b/ges/ges-audio-transition.c @@ -192,7 +192,7 @@ ges_audio_transition_create_element (GESTrackElement * track_element) gst_bin_add_many (GST_BIN (topbin), iconva, iconvb, oconv, NULL); - mixer = gst_element_factory_make ("adder", NULL); + mixer = gst_element_factory_make ("audiomixer", NULL); gst_bin_add (GST_BIN (topbin), mixer); atarget = link_element_to_mixer_with_volume (GST_BIN (topbin), iconva, mixer); diff --git a/ges/ges-smart-adder.c b/ges/ges-smart-adder.c index a1bea12697..4c9504a868 100644 --- a/ges/ges-smart-adder.c +++ b/ges/ges-smart-adder.c @@ -83,7 +83,10 @@ _request_new_pad (GstElement * element, GstPadTemplate * templ, PadInfos *infos = g_slice_new0 (PadInfos); GESSmartAdder *self = GES_SMART_ADDER (element); - infos->adder_pad = gst_element_request_pad (self->adder, templ, NULL, caps); + infos->adder_pad = gst_element_request_pad (self->adder, + gst_element_class_get_pad_template (GST_ELEMENT_GET_CLASS (self->adder), + "sink_%u"), NULL, caps); + if (infos->adder_pad == NULL) { GST_WARNING_OBJECT (element, "Could not get any pad from GstAdder"); g_slice_free (PadInfos, infos); @@ -202,7 +205,7 @@ ges_smart_adder_init (GESSmartAdder * self) g_mutex_init (&self->lock); - self->adder = gst_element_factory_make ("adder", "smart-adder-adder"); + self->adder = gst_element_factory_make ("audiomixer", "smart-adder-adder"); gst_bin_add (GST_BIN (self), self->adder); pad = gst_element_get_static_pad (self->adder, "src"); -- 2.34.1