mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-23 08:46:40 +00:00
ges: Use audiomixer instead of adder by default
This commit is contained in:
parent
b3336fe26e
commit
aa69de7514
2 changed files with 6 additions and 3 deletions
|
@ -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);
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Reference in a new issue