Commit 78418c51 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove vlc_object_detach()

parent fbbde4b2
...@@ -45,12 +45,6 @@ void system_Init ( libvlc_int_t *, int *, const char *[] ); ...@@ -45,12 +45,6 @@ void system_Init ( libvlc_int_t *, int *, const char *[] );
void system_Configure ( libvlc_int_t *, int, const char *const [] ); void system_Configure ( libvlc_int_t *, int, const char *const [] );
void system_End ( libvlc_int_t * ); void system_End ( libvlc_int_t * );
/*
* Legacy object stuff that is still used within libvlccore (only)
*/
void vlc_object_detach (vlc_object_t *);
#define vlc_object_detach( o ) vlc_object_detach(VLC_OBJECT(o))
/* /*
* Threads subsystem * Threads subsystem
*/ */
......
...@@ -615,7 +615,7 @@ void vlc_object_release( vlc_object_t *p_this ) ...@@ -615,7 +615,7 @@ void vlc_object_release( vlc_object_t *p_this )
* attach object to a parent object * attach object to a parent object
***************************************************************************** *****************************************************************************
* This function sets p_this as a child of p_parent, and p_parent as a parent * This function sets p_this as a child of p_parent, and p_parent as a parent
* of p_this. This link can be undone using vlc_object_detach. * of p_this.
*****************************************************************************/ *****************************************************************************/
void vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent ) void vlc_object_attach( vlc_object_t *p_this, vlc_object_t *p_parent )
{ {
...@@ -684,28 +684,6 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this) ...@@ -684,28 +684,6 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this)
p_this->p_parent = NULL; p_this->p_parent = NULL;
} }
#undef vlc_object_detach
/**
****************************************************************************
* detach object from its parent
*****************************************************************************
* This function removes all links between an object and its parent.
*****************************************************************************/
void vlc_object_detach( vlc_object_t *p_this )
{
vlc_object_t *p_parent;
if( !p_this ) return;
libvlc_lock (p_this->p_libvlc);
p_parent = p_this->p_parent;
if (p_parent)
vlc_object_detach_unlocked( p_this );
libvlc_unlock (p_this->p_libvlc);
if (p_parent)
vlc_object_release (p_parent);
}
#undef vlc_list_children #undef vlc_list_children
/** /**
* Gets the list of children of an objects, and increment their reference * Gets the list of children of an objects, and increment their reference
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment