X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_objects.h;h=34149d027aa6f87ed6699e0e5c7e16eb7f4728f2;hb=676a627a1ff186119ec05f690e34645a3e003431;hp=a41f74adafcea4f8a743525d6d861649fa278f48;hpb=fbb8255dcf8ced858d59927cb17c4f577a8d9c15;p=vlc

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index a41f74adaf..34149d027a 100644
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -42,16 +42,9 @@
 #define VLC_OBJECT_AOUT        (-10)
 #define VLC_OBJECT_PACKETIZER  (-13)
 #define VLC_OBJECT_ENCODER     (-14)
-#define VLC_OBJECT_DIALOGS     (-15)
 #define VLC_OBJECT_ANNOUNCE    (-17)
-#define VLC_OBJECT_DEMUX       (-18)
-#define VLC_OBJECT_ACCESS      (-19)
-#define VLC_OBJECT_STREAM      (-20)
 #define VLC_OBJECT_OPENGL      (-21)
-#define VLC_OBJECT_FILTER      (-22)
 #define VLC_OBJECT_OSDMENU     (-28)
-#define VLC_OBJECT_HTTPD_HOST  (-30)
-#define VLC_OBJECT_INTERACTION (-32)
 /* Please add new object types below -34 */
 /* Please do not add new object types anyway */
 #define VLC_OBJECT_GENERIC     (-666)
@@ -169,7 +162,12 @@ VLC_EXPORT( void, __vlc_object_kill, ( vlc_object_t * ) );
 #define vlc_object_kill(a) \
     __vlc_object_kill( VLC_OBJECT(a) )
 
-VLC_EXPORT( bool, __vlc_object_alive, ( vlc_object_t * ) );
+static inline bool __vlc_object_alive (const vlc_object_t *obj)
+{
+    barrier ();
+    return !obj->b_die;
+}
+
 #define vlc_object_alive(a) \
     __vlc_object_alive( VLC_OBJECT(a) )