From 61e998e12c249c8b66164ca3f6d74994bd10d1e3 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 19 Apr 2005 11:23:00 +0000 Subject: gnl/gnlcomposition.c: gnl_composition_dispose was superfluous, now removed Original commit message from CVS: * gnl/gnlcomposition.c: gnl_composition_dispose was superfluous, now removed --- ChangeLog | 5 +++++ gnl/gnlcomposition.c | 23 ----------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcb24b9..5d378fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-04-19 Edward Hervey + + * gnl/gnlcomposition.c: + gnl_composition_dispose was superfluous, now removed + 2005-04-12 Edward Hervey * configure.ac: releasing 0.2.0 !! diff --git a/gnl/gnlcomposition.c b/gnl/gnlcomposition.c index 28d4622..4400d35 100644 --- a/gnl/gnlcomposition.c +++ b/gnl/gnlcomposition.c @@ -31,7 +31,6 @@ static GstElementDetails gnl_composition_details = GST_ELEMENT_DETAILS ( static void gnl_composition_base_init (gpointer g_class); static void gnl_composition_class_init (GnlCompositionClass *klass); static void gnl_composition_init (GnlComposition *comp); -static void gnl_composition_dispose (GObject *object); static void gnl_composition_finalize (GObject *object); static GstElementStateReturn @@ -115,7 +114,6 @@ gnl_composition_class_init (GnlCompositionClass *klass) parent_class = g_type_class_ref (GNL_TYPE_OBJECT); - gobject_class->dispose = gnl_composition_dispose; gobject_class->finalize = gnl_composition_finalize; gstelement_class->change_state = gnl_composition_change_state; @@ -142,27 +140,6 @@ gnl_composition_init (GnlComposition *comp) comp->to_remove = NULL; } -static void -gnl_composition_dispose (GObject *object) -{ - GnlComposition *comp = GNL_COMPOSITION (object); - GList *objects = comp->objects; - GnlCompositionEntry *entry = NULL; - - GST_INFO("dispose"); - while (objects) { - entry = (GnlCompositionEntry *) (objects->data); - GST_INFO ("Removing %s", - gst_element_get_name (GST_ELEMENT (entry->object))); - - g_object_unref (entry->object); - - objects = g_list_next (objects); - } - - G_OBJECT_CLASS (parent_class)->dispose (object); -} - static void gnl_composition_finalize (GObject *object) { -- cgit v1.2.3