Use a proper condition variable for variable callback handling

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index c531a4d9c3e28849bb4b109222f5453044c30c45..eadc1faeb76dd6f8b135ba6cb043dfe01cef8a05 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -70,16 +70,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;
@@ -89,19 +87,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 */
@@ -139,14 +127,17 @@ __vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type,
 #define vlc_custom_create(o, s, t, n) \
         __vlc_custom_create(VLC_OBJECT(o), s, t, n)
 
-
-/**
- * The module bank
+/*
+ * To be cleaned-up module stuff:
  */
-extern module_bank_t *p_module_bank;
-
 extern char *psz_vlcpath;
 
+/* Return a NULL terminated array with the names of the modules that have a
+ * certain capability.
+ * Free after uses both the string and the table. */
+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
@@ -159,6 +150,7 @@ typedef struct vlc_object_internals_t
     /* Object variables */
     variable_t *    p_vars;
     vlc_mutex_t     var_lock;
+    vlc_cond_t      var_wait;
     int             i_vars;
 
     /* Thread properties, if any */