summaryrefslogtreecommitdiffstats
path: root/ext/esd
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2004-11-01 11:02:31 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2004-11-01 11:02:31 +0000
commitea8e39aa433d0e956dc6114d69ac950f0343b02d (patch)
tree22a0d59e82e488ccefad565d538e8cf548ae5a98 /ext/esd
parent56443c3d45f2cd90281f13bc04d0e0c1790adc99 (diff)
ext/esd/esdsink.c: Use a finalize function, not dispose, and more importantly, call the parent class finalize functio...
Original commit message from CVS: * ext/esd/esdsink.c: (gst_esdsink_class_init), (gst_esdsink_finalize): Use a finalize function, not dispose, and more importantly, call the parent class finalize function too
Diffstat (limited to 'ext/esd')
-rw-r--r--ext/esd/esdsink.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index f8732f8e..c9294424 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -68,7 +68,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
static void gst_esdsink_base_init (gpointer g_class);
static void gst_esdsink_class_init (gpointer g_class, gpointer class_data);
static void gst_esdsink_init (GTypeInstance * instance, gpointer g_class);
-static void gst_esdsink_dispose (GObject * object);
+static void gst_esdsink_finalize (GObject * object);
static gboolean gst_esdsink_open_audio (GstEsdsink * sink);
static void gst_esdsink_close_audio (GstEsdsink * sink);
@@ -146,7 +146,7 @@ gst_esdsink_class_init (gpointer g_class, gpointer class_data)
gobject_class->set_property = gst_esdsink_set_property;
gobject_class->get_property = gst_esdsink_get_property;
- gobject_class->dispose = gst_esdsink_dispose;
+ gobject_class->finalize = gst_esdsink_finalize;
gstelement_class->change_state = gst_esdsink_change_state;
gstelement_class->set_clock = gst_esdsink_set_clock;
@@ -189,11 +189,13 @@ gst_esdsink_init (GTypeInstance * instance, gpointer g_class)
}
static void
-gst_esdsink_dispose (GObject * object)
+gst_esdsink_finalize (GObject * object)
{
GstEsdsink *esdsink = GST_ESDSINK (object);
g_free (esdsink->host);
+
+ G_OBJECT_CLASS (parent_class)->finalize (object);
}
#ifdef unused