Remove uninitialized and unsynchronized global stats

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index 84f080c60a870db96ced8835175735a110be60ea..bf5094dfc66c703f54d362639330ed564d630ad0 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -42,6 +42,15 @@ void system_Init      ( libvlc_int_t *, int *, const char *[] );
 void system_Configure ( libvlc_int_t *, int *, const char *[] );
 void system_End       ( libvlc_int_t * );
 
+/*
+ * Legacy object stuff that is still used within libvlccore (only)
+ */
+#define vlc_object_signal_unlocked( obj )
+
+vlc_list_t *vlc_list_find( vlc_object_t *, int, int );
+#define VLC_OBJECT_INTF        (-4)
+#define VLC_OBJECT_PACKETIZER  (-13)
+
 /*
  * Threads subsystem
  */
@@ -49,9 +58,6 @@ void system_End       ( libvlc_int_t * );
 /* 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__)
@@ -138,14 +144,17 @@ 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 ) );
+char **module_GetModulesNamesForCapability (const char * psz_capability,
+                                            char ***psz_longname);
+module_t *module_find_by_shortcut (const char *psz_shortcut);
 
 /**
  * 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;
@@ -158,7 +167,6 @@ typedef struct vlc_object_internals_t
 
     /* Objects thread synchronization */
     vlc_mutex_t     lock;
-    vlc_cond_t      wait;
     int             pipes[2];
 
     /* Objects management */
@@ -188,6 +196,7 @@ typedef struct sap_handler_t sap_handler_t;
 typedef struct libvlc_priv_t
 {
     libvlc_int_t       public_data;
+    vlc_cond_t         exiting; ///< signaled when VLC wants to exit
 
     /* Configuration */
     vlc_mutex_t        config_lock; ///< config file lock
@@ -208,9 +217,6 @@ typedef struct libvlc_priv_t
     int                i_timers;    ///< Number of timers
     bool               b_stats;     ///< Whether to collect stats
 
-    void              *p_stats_computer;  ///< Input thread computing stats
-                                          /// (needs cleanup)
-
     /* Singleton objects */
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     playlist_t        *p_playlist; //< the playlist singleton