p_root->p_probe: unused, remove

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index da25c7d6a7ffebaa307e5c251875cf24c84f731c..6a31ff684386940bde0c5d3a9d6c8734de0e82ac 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -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
@@ -102,27 +109,18 @@ struct libvlc_global_data_t
 {
     VLC_COMMON_MEMBERS
 
-    bool             b_ready;     ///< Initialization boolean
-
    /* Object structure data */
     int                    i_counter;   ///< object counter
     int                    i_objects;   ///< Attached objects count
     vlc_object_t **        pp_objects;  ///< Array of all objects
 
     module_bank_t *        p_module_bank; ///< The module bank
-    intf_thread_t         *p_probe;       ///< Devices prober
 
     /* Arch-specific variables */
-#if !defined( WIN32 )
-    bool             b_daemon;
-#endif
 #if defined( SYS_BEOS )
-    vlc_object_t *         p_appthread;
     char *                 psz_vlcpath;
 #elif defined( __APPLE__ )
     char *                 psz_vlcpath;
-    vlc_iconv_t            iconv_macosx; /* for HFS+ file names */
-    vlc_mutex_t            iconv_lock;
 #elif defined( WIN32 )
     char *                 psz_vlcpath;
 #endif
@@ -142,7 +140,7 @@ struct vlc_object_internals_t
 
     /* Thread properties, if any */
     vlc_thread_t    thread_id;
-    bool      b_thread;
+    bool            b_thread;
 
     /* Objects thread synchronization */
     int             pipes[2];
@@ -151,7 +149,7 @@ struct vlc_object_internals_t
     /* Objects management */
     unsigned         i_refcount;
     vlc_destructor_t pf_destructor;
-    bool       b_attached;
+    bool             b_attached;
 };
 
 #define ZOOM_SECTION N_("Zoom")
@@ -162,7 +160,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[];