diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 16:08:22 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-10-27 16:08:22 +0200 |
| commit | 4b6a22626340470c1de34dda0b63d529cf2aa760 (patch) | |
| tree | cb1b10a4d63a2a5612570a6794113a993231bc63 /gst/equalizer | |
| parent | fc4684f4c643e6c1a225e28c87cc5267464b4c75 (diff) | |
| parent | 1b213d905ac2b9a1e015be6daf0dfeb92294154c (diff) | |
| download | gstreamer-plugins-good-4b6a22626340470c1de34dda0b63d529cf2aa760.tar.gz | |
Merge branch 'master' into 0.11
Conflicts:
ext/pulse/pulseaudiosink.c
ext/pulse/pulsesink.c
Diffstat (limited to 'gst/equalizer')
| -rw-r--r-- | gst/equalizer/gstiirequalizer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c index f7ef5c3e3..3872a02fa 100644 --- a/gst/equalizer/gstiirequalizer.c +++ b/gst/equalizer/gstiirequalizer.c @@ -642,10 +642,10 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count) /* add new bands */ equ->bands = g_realloc (equ->bands, sizeof (GstObject *) * new_count); for (i = old_count; i < new_count; i++) { - equ->bands[i] = g_object_new (GST_TYPE_IIR_EQUALIZER_BAND, NULL); /* otherwise they get names like 'iirequalizerband5' */ sprintf (name, "band%u", i); - gst_object_set_name (GST_OBJECT (equ->bands[i]), name); + equ->bands[i] = g_object_new (GST_TYPE_IIR_EQUALIZER_BAND, + "name", name, NULL); GST_DEBUG ("adding band[%d]=%p", i, equ->bands[i]); gst_object_set_parent (GST_OBJECT (equ->bands[i]), GST_OBJECT (equ)); |