vlc_internals(): use pointer arithmetic

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index b82d77f73b86a9c08b579adfaefc96ce9b242472..1e8f74f45ccdc4570aab0c60fb6271f609a54d9c 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -25,13 +25,13 @@
 #ifndef LIBVLC_LIBVLC_H
 # define LIBVLC_LIBVLC_H 1
 
-# include <stdbool.h>
-
 extern const char vlc_usage[];
 
+/* Hotkey stuff */
 extern const struct hotkey libvlc_hotkeys[];
 extern const size_t libvlc_hotkeys_size;
-
+extern int vlc_key_to_action (vlc_object_t *, const char *,
+                              vlc_value_t, vlc_value_t, void *);
 
 /*
  * OS-specific initialization
@@ -56,8 +56,15 @@ VLC_EXPORT( const char * , system_VLCPath, (void));
 /*
  * Threads subsystem
  */
-int __vlc_threads_init( vlc_object_t * );
-int __vlc_threads_end( vlc_object_t * );
+int vlc_threads_init( void );
+void vlc_threads_end( void );
+
+/** The global thread var for msg stack context
+ *  We store this as a static global variable so we don't need a vlc_object_t
+ *  everywhere.
+ *  This key is created in vlc_threads_init and is therefore ready to use at
+ *  the very beginning of the universe */
+extern vlc_threadvar_t msg_context_global_key;
 
 /*
  * CPU capabilities
@@ -73,7 +80,21 @@ uint32_t CPUCapabilities( void );
  * LibVLC objects stuff
  */
 
-extern vlc_object_t *
+/**
+ * Creates a VLC object.
+ *
+ * Note that because the object name pointer must remain valid, potentially
+ * even after the destruction of the object (through the message queues), this
+ * function CANNOT be exported to plugins as is. In this case, the old
+ * vlc_object_create() must be used instead.
+ *
+ * @param p_this an existing VLC object
+ * @param i_size byte size of the object structure
+ * @param i_type object type, usually VLC_OBJECT_CUSTOM
+ * @param psz_type object type name
+ * @return the created object, or NULL.
+ */
+extern void *
 vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
                    const char *psz_type);
 
@@ -88,7 +109,7 @@ struct libvlc_global_data_t
 {
     VLC_COMMON_MEMBERS
 
-    vlc_bool_t             b_ready;     ///< Initialization boolean
+    bool             b_ready;     ///< Initialization boolean
 
    /* Object structure data */
     int                    i_counter;   ///< object counter
@@ -100,7 +121,7 @@ struct libvlc_global_data_t
 
     /* Arch-specific variables */
 #if !defined( WIN32 )
-    vlc_bool_t             b_daemon;
+    bool             b_daemon;
 #endif
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
@@ -128,15 +149,16 @@ struct vlc_object_internals_t
 
     /* Thread properties, if any */
     vlc_thread_t    thread_id;
-    vlc_bool_t      b_thread;
+    bool            b_thread;
 
     /* Objects thread synchronization */
     int             pipes[2];
     vlc_spinlock_t  spin;
 
     /* Objects management */
-    unsigned        i_refcount;
-    vlc_bool_t      b_attached;
+    unsigned         i_refcount;
+    vlc_destructor_t pf_destructor;
+    bool             b_attached;
 };
 
 #define ZOOM_SECTION N_("Zoom")
@@ -147,7 +169,7 @@ struct vlc_object_internals_t
 
 static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj )
 {
-    return obj->p_internals;
+    return ((vlc_object_internals_t *)obj) - 1;
 }
 
 extern module_config_t libvlc_config[];