mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

controlbinding: only take a weak ref on the object

Browse source 
Fixes the leaks in the tests. Added a TODO comment to eventually rework this
some more (while we can).
This commit is contained in:
Stefan Sauer 2012-04-13 08:10:19 +02:00
parent 25424c3fd0
commit 7485b66d06
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
gst/gstcontrolbinding.c
View file

@ -25,6 +25,13 @@
* *
* A value mapping object that attaches control sources to gobject properties. * A value mapping object that attaches control sources to gobject properties.
*/ */
/* FIXME(ensonic): should we make gst_object_add_control_binding() internal
* - we create the control_binding for a certain object anyway
* - we could call gst_object_add_control_binding() at the end of
* gst_control_binding_constructor()
* - the weak-ref on object is not nice, as is the same as gst_object_parent()
* once the object is added to the parent
*/
#include "gst_private.h" #include "gst_private.h"
@ -130,8 +137,10 @@ gst_control_binding_dispose (GObject * object)
{ {
GstControlBinding *self = GST_CONTROL_BINDING (object); GstControlBinding *self = GST_CONTROL_BINDING (object);
if (self->object) /* we did not took a reference */
gst_object_replace (&self->object, NULL); g_object_remove_weak_pointer ((GObject *) self->object,
(gpointer *) & self->object);
self->object = NULL;
((GObjectClass *) gst_control_binding_parent_class)->dispose (object); ((GObjectClass *) gst_control_binding_parent_class)->dispose (object);
} }
@ -154,7 +163,10 @@ gst_control_binding_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_OBJECT: case PROP_OBJECT:
self->object = g_value_dup_object (value); /* do not ref to avoid a ref cycle */
self->object = g_value_get_object (value);
g_object_add_weak_pointer ((GObject *) self->object,
(gpointer *) & self->object);
break; break;
case PROP_NAME: case PROP_NAME:
self->name = g_value_dup_string (value); self->name = g_value_dup_string (value);