s/vlc_object_die/vlc_object_kill/

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 71565ab947f5b729d144337d2bcc3a75f4761f82..e0c6e572527cbab130682d6e9c93a8b97839572c 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -21,6 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 /**
  * \file
  * This file defines the vlc_object_t structure and object types.
@@ -32,7 +36,7 @@
  */
 
 /* Object types */
-#define VLC_OBJECT_ROOT        (-1)
+#define VLC_OBJECT_GLOBAL      (-1)
 #define VLC_OBJECT_LIBVLC      (-2)
 #define VLC_OBJECT_MODULE      (-3)
 #define VLC_OBJECT_INTF        (-4)
@@ -92,6 +96,7 @@ struct vlc_object_t
  *****************************************************************************/
 VLC_EXPORT( void *, __vlc_object_create, ( vlc_object_t *, int ) );
 VLC_EXPORT( void, __vlc_object_destroy, ( vlc_object_t * ) );
+VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
 VLC_EXPORT( void, __vlc_object_detach, ( vlc_object_t * ) );
 VLC_EXPORT( void *, __vlc_object_get, ( vlc_object_t *, int ) );