Privatize vlc_object_t.i_object_type

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 14b128e9530e5355d318052d105f37da8d8dffa1..f76fd7400cfed4bd0c60110d524799746de170bd 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -45,11 +45,13 @@ void system_End       ( libvlc_int_t * );
 /*
  * Threads subsystem
  */
-extern vlc_mutex_t global_lock; /* TODO: remove this crap */
 
 /* Hopefully, no need to export this. There is a new thread API instead. */
 void vlc_thread_cancel (vlc_object_t *);
 int vlc_object_waitpipe (vlc_object_t *obj);
+void __vlc_object_signal_unlocked (vlc_object_t *);
+#define vlc_object_signal_unlocked( obj ) \
+    __vlc_object_signal_unlocked( VLC_OBJECT( obj ) )
 
 void vlc_trace (const char *fn, const char *file, unsigned line);
 #define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)
@@ -71,16 +73,14 @@ uint32_t CPUCapabilities( void );
  * Message/logging stuff
  */
 
-typedef struct msg_queue_t
+/**
+ * Store all data required by messages interfaces.
+ */
+typedef struct msg_bank_t
 {
     /** Message queue lock */
-    vlc_mutex_t             lock;
-    bool              b_overflow;
-
-    /* Message queue */
-    msg_item_t              msg[VLC_MSG_QSIZE];           /**< message queue */
-    int i_start;
-    int i_stop;
+    vlc_mutex_t lock;
+    vlc_cond_t  wait;
 
     /* Subscribers */
     int i_sub;
@@ -90,19 +90,9 @@ typedef struct msg_queue_t
 #ifdef UNDER_CE
     FILE *logfile;
 #endif
-} msg_queue_t;
-
-/**
- * Store all data required by messages interfaces.
- */
-typedef struct msg_bank_t
-{
-    vlc_mutex_t             lock;
-    msg_queue_t             queue;
 } msg_bank_t;
 
 void msg_Create  (libvlc_int_t *);
-void msg_Flush   (libvlc_int_t *);
 void msg_Destroy (libvlc_int_t *);
 
 /** Internal message stack context */
@@ -151,34 +141,27 @@ extern char *psz_vlcpath;
 VLC_EXPORT(char **, module_GetModulesNamesForCapability,
                     ( const char * psz_capability, char ***psz_longname ) );
 
-#ifdef LIBVLC_USE_PTHREAD
-# include <semaphore.h> /* TODO: get rid of vlc_thread_ready and this */
-#endif
-
 /**
  * Private LibVLC data for each object.
  */
 typedef struct vlc_object_internals_t
 {
+    int             i_object_type; /* Object type, deprecated */
+
     /* Object variables */
     variable_t *    p_vars;
     vlc_mutex_t     var_lock;
+    vlc_cond_t      var_wait;
     int             i_vars;
 
     /* Thread properties, if any */
     vlc_thread_t    thread_id;
     bool            b_thread;
-#ifdef LIBVLC_USE_PTHREAD
-    sem_t           thread_ready;
-#elif defined (WIN32)
-    HANDLE          thread_ready;
-#endif
 
     /* Objects thread synchronization */
     vlc_mutex_t     lock;
     vlc_cond_t      wait;
     int             pipes[2];
-    vlc_spinlock_t  spin;
 
     /* Objects management */
     vlc_spinlock_t   ref_spin;
@@ -235,6 +218,7 @@ typedef struct libvlc_priv_t
     playlist_t        *p_playlist; //< the playlist singleton
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     interaction_t     *p_interaction;    ///< interface interaction object
+    intf_thread_t     *p_interaction_intf; ///< XXX interface for interaction
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
 #ifdef ENABLE_SOUT
     sap_handler_t     *p_sap; ///< SAP SDP advertiser