Fix vlc_thread_ready invalid use of object_wait

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index a4e48517aaa95dc032e46c92cdfa11bfd0d3bfc6..6cd9a0d93f9740e10fc24b84298fd41a2fba9935 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -50,10 +50,18 @@ void vlc_threads_end( void );
 
 /* 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_trace (const char *fn, const char *file, unsigned line);
 #define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)
 
+#if defined (LIBVLC_USE_PTHREAD) && !defined (NDEBUG)
+# define vlc_assert_locked( m ) \
+         assert (pthread_mutex_lock (m) == EDEADLK)
+#else
+# define vlc_assert_locked( m ) (void)m
+#endif
+
 /*
  * CPU capabilities
  */
@@ -133,26 +141,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)
 
-/**
- * libvlc_global_data_t (global variable)
- *
- * This structure has an unique instance, statically allocated in libvlc and
- * never accessed from the outside. It stores process-wide VLC variables,
- * mostly process-wide locks, and (currently) the module bank and objects tree.
- */
-typedef struct libvlc_global_data_t
-{
-    VLC_COMMON_MEMBERS
-
-    char *                 psz_vlcpath;
-} libvlc_global_data_t;
 
 /**
  * The module bank
  */
 extern module_bank_t *p_module_bank;
 
-libvlc_global_data_t *vlc_global (void);
+extern char *psz_vlcpath;
+
+#ifdef LIBVLC_USE_PTHREAD
+# include <semaphore.h> /* TODO: get rid of vlc_thread_ready and this */
+#endif
 
 /**
  * Private LibVLC data for each object.
@@ -167,6 +166,11 @@ typedef struct vlc_object_internals_t
     /* 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;
@@ -206,9 +210,6 @@ typedef struct libvlc_priv_t
     vlc_mutex_t        config_lock; ///< config file lock
     char *             psz_configfile;   ///< location of config file
 
-    /* There is no real reason to keep a list of items, but not to break
-     * everything, let's keep it */
-    input_item_array_t input_items; ///< Array of all created input items
     int                i_last_input_id ; ///< Last id of input item
 
     /* Messages */
@@ -236,6 +237,7 @@ typedef struct libvlc_priv_t
 #ifdef ENABLE_SOUT
     sap_handler_t     *p_sap; ///< SAP SDP advertiser
 #endif
+    vlc_mutex_t        structure_lock;
 } libvlc_priv_t;
 
 static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)