http access: Use EnsureUTF8() on the ICY strings. Avoids "illegal byte sequence"...

[vlc] / include / vlc_objects.h

diff --git a/include/vlc_objects.h b/include/vlc_objects.h
index 81ee3fdeed937a228c144c7281e44714bb2cb8f2..34149d027aa6f87ed6699e0e5c7e16eb7f4728f2 100644 (file)
--- a/include/vlc_objects.h
+++ b/include/vlc_objects.h
@@ -21,10 +21,6 @@
  * 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.
@@ -46,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)
@@ -173,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) )