From 78418c511a5eb18e5bf1f3e552676a40e6d8d15f Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Tue, 25 May 2010 23:36:04 +0300
Subject: [PATCH] Remove vlc_object_detach()

---
 src/libvlc.h       |  6 ------
 src/misc/objects.c | 24 +-----------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/libvlc.h b/src/libvlc.h
index 2a95283b40..4af6d82ea4 100644
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -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_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
  */
diff --git a/src/misc/objects.c b/src/misc/objects.c
index 20a840a6e6..d4a808c61d 100644
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -615,7 +615,7 @@ void vlc_object_release( vlc_object_t *p_this )
  * attach object to a parent object
  *****************************************************************************
  * 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 )
 {
@@ -684,28 +684,6 @@ static void vlc_object_detach_unlocked (vlc_object_t *p_this)
     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
 /**
  * Gets the list of children of an objects, and increment their reference
-- 
2.39.5