summaryrefslogtreecommitdiff
path: root/gst/equalizer
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2012-03-31 15:43:49 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2012-03-31 15:43:49 +0200
commit068ee88862af7a55c478a69a06530087b52932ce (patch)
tree0fa27d4a502a2c0b487c25c307709d963d25ea4d /gst/equalizer
parent3d61d12e03f8c661552454c351e40b1c2da95470 (diff)
update for child proxy api change
Diffstat (limited to 'gst/equalizer')
-rw-r--r--gst/equalizer/gstiirequalizer.c14
-rw-r--r--gst/equalizer/gstiirequalizer10bands.c40
-rw-r--r--gst/equalizer/gstiirequalizer3bands.c12
3 files changed, 33 insertions, 33 deletions
diff --git a/gst/equalizer/gstiirequalizer.c b/gst/equalizer/gstiirequalizer.c
index ac20f352d..9d716dad0 100644
--- a/gst/equalizer/gstiirequalizer.c
+++ b/gst/equalizer/gstiirequalizer.c
@@ -307,12 +307,12 @@ gst_iir_equalizer_band_get_type (void)
/* child proxy iface */
-static GstObject *
+static GObject *
gst_iir_equalizer_child_proxy_get_child_by_index (GstChildProxy * child_proxy,
guint index)
{
GstIirEqualizer *equ = GST_IIR_EQUALIZER (child_proxy);
- GstObject *ret;
+ GObject *ret;
BANDS_LOCK (equ);
if (G_UNLIKELY (index >= equ->freq_band_count)) {
@@ -320,7 +320,7 @@ gst_iir_equalizer_child_proxy_get_child_by_index (GstChildProxy * child_proxy,
g_return_val_if_fail (index < equ->freq_band_count, NULL);
}
- ret = gst_object_ref (equ->bands[index]);
+ ret = g_object_ref (equ->bands[index]);
BANDS_UNLOCK (equ);
GST_LOG_OBJECT (equ, "return child[%d] %" GST_PTR_FORMAT, index, ret);
@@ -653,15 +653,15 @@ gst_iir_equalizer_compute_frequencies (GstIirEqualizer * equ, guint new_count)
GST_DEBUG ("adding band[%d]=%p", i, equ->bands[i]);
gst_object_set_parent (GST_OBJECT (equ->bands[i]), GST_OBJECT (equ));
- gst_child_proxy_child_added (GST_OBJECT (equ),
- GST_OBJECT (equ->bands[i]));
+ gst_child_proxy_child_added (G_OBJECT (equ),
+ G_OBJECT (equ->bands[i]), name);
}
} else {
/* free unused bands */
for (i = new_count; i < old_count; i++) {
GST_DEBUG ("removing band[%d]=%p", i, equ->bands[i]);
- gst_child_proxy_child_removed (GST_OBJECT (equ),
- GST_OBJECT (equ->bands[i]));
+ gst_child_proxy_child_removed (G_OBJECT (equ),
+ G_OBJECT (equ->bands[i]), GST_OBJECT_NAME (equ->bands[i]));
gst_object_unparent (GST_OBJECT (equ->bands[i]));
equ->bands[i] = NULL;
}
diff --git a/gst/equalizer/gstiirequalizer10bands.c b/gst/equalizer/gstiirequalizer10bands.c
index 5dc790b85..3eff9911e 100644
--- a/gst/equalizer/gstiirequalizer10bands.c
+++ b/gst/equalizer/gstiirequalizer10bands.c
@@ -150,34 +150,34 @@ gst_iir_equalizer_10bands_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_BAND0:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band0::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band0::gain", value);
break;
case PROP_BAND1:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band1::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band1::gain", value);
break;
case PROP_BAND2:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band2::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band2::gain", value);
break;
case PROP_BAND3:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band3::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band3::gain", value);
break;
case PROP_BAND4:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band4::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band4::gain", value);
break;
case PROP_BAND5:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band5::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band5::gain", value);
break;
case PROP_BAND6:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band6::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band6::gain", value);
break;
case PROP_BAND7:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band7::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band7::gain", value);
break;
case PROP_BAND8:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band8::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band8::gain", value);
break;
case PROP_BAND9:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band9::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band9::gain", value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -193,34 +193,34 @@ gst_iir_equalizer_10bands_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_BAND0:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band0::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band0::gain", value);
break;
case PROP_BAND1:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band1::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band1::gain", value);
break;
case PROP_BAND2:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band2::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band2::gain", value);
break;
case PROP_BAND3:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band3::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band3::gain", value);
break;
case PROP_BAND4:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band4::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band4::gain", value);
break;
case PROP_BAND5:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band5::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band5::gain", value);
break;
case PROP_BAND6:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band6::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band6::gain", value);
break;
case PROP_BAND7:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band7::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band7::gain", value);
break;
case PROP_BAND8:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band8::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band8::gain", value);
break;
case PROP_BAND9:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band9::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band9::gain", value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/gst/equalizer/gstiirequalizer3bands.c b/gst/equalizer/gstiirequalizer3bands.c
index 513b9204d..b55ddb506 100644
--- a/gst/equalizer/gstiirequalizer3bands.c
+++ b/gst/equalizer/gstiirequalizer3bands.c
@@ -105,13 +105,13 @@ gst_iir_equalizer_3bands_set_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_BAND0:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band0::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band0::gain", value);
break;
case PROP_BAND1:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band1::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band1::gain", value);
break;
case PROP_BAND2:
- gst_child_proxy_set_property (GST_OBJECT (equ), "band2::gain", value);
+ gst_child_proxy_set_property (G_OBJECT (equ), "band2::gain", value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -127,13 +127,13 @@ gst_iir_equalizer_3bands_get_property (GObject * object, guint prop_id,
switch (prop_id) {
case PROP_BAND0:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band0::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band0::gain", value);
break;
case PROP_BAND1:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band1::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band1::gain", value);
break;
case PROP_BAND2:
- gst_child_proxy_get_property (GST_OBJECT (equ), "band2::gain", value);
+ gst_child_proxy_get_property (G_OBJECT (equ), "band2::gain", value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);