diff options
Diffstat (limited to 'gst/gstbin.c')
| -rw-r--r-- | gst/gstbin.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/gst/gstbin.c b/gst/gstbin.c index 561328e5c0..4396fe3da4 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -37,7 +37,7 @@ GstElementDetails gst_bin_details = { }; -static void gst_bin_real_destroy (GObject *object); +static void gst_bin_dispose (GObject *object); static GstElementStateReturn gst_bin_change_state (GstElement *element); static GstElementStateReturn gst_bin_change_state_norecurse (GstBin *bin); @@ -87,6 +87,7 @@ gst_bin_get_type (void) sizeof(GstBin), 8, (GInstanceInitFunc)gst_bin_init, + NULL }; bin_type = g_type_register_static (GST_TYPE_ELEMENT, "GstBin", &bin_info, 0); } @@ -122,8 +123,7 @@ gst_bin_class_init (GstBinClass *klass) gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_bin_change_state); -// FIXME -// gobject_class->destroy = GST_DEBUG_FUNCPTR (gst_bin_real_destroy); + gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_bin_dispose); } static void @@ -170,7 +170,7 @@ gst_bin_reset_element_sched (GstElement *element, GstSchedule *sched) // GST_SCHEDULE_ADD_ELEMENT (sched, element); } -void +static void gst_bin_set_element_sched (GstElement *element,GstSchedule *sched) { GList *children; @@ -211,7 +211,7 @@ gst_bin_set_element_sched (GstElement *element,GstSchedule *sched) } -void +static void gst_bin_unset_element_sched (GstElement *element) { GList *children; @@ -475,13 +475,13 @@ gst_bin_set_state_type (GstBin *bin, } static void -gst_bin_real_destroy (GObject *object) +gst_bin_dispose (GObject *object) { GstBin *bin = GST_BIN (object); GList *children, *orig; GstElement *child; - GST_DEBUG (GST_CAT_REFCOUNTING,"destroy()\n"); + GST_DEBUG (GST_CAT_REFCOUNTING,"dispose\n"); if (bin->children) { orig = children = g_list_copy (bin->children); @@ -500,9 +500,7 @@ gst_bin_real_destroy (GObject *object) g_cond_free (bin->eoscond); -// FIXME!!! -// if (G_OBJECT_CLASS (parent_class)->destroy) -// G_OBJECT_CLASS (parent_class)->destroy (object); + G_OBJECT_CLASS (parent_class)->dispose (object); } /** |