libvlc: Put vlc_usage in the same file than where it is used.

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index bb010f6d65540732b9bded61454de1abc94873de..b6560e7990792d6deb40b404cfbb4462b8bdb719 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -27,11 +27,14 @@
 
 typedef struct variable_t variable_t;
 
-extern const char vlc_usage[];
-
-/* Hotkey stuff */
-extern const struct hotkey libvlc_hotkeys[];
-extern const size_t libvlc_hotkeys_size;
+/* Actions (hot keys) */
+typedef struct action
+{
+    char name[24];
+    int  value;
+} action_t;
+extern const struct action libvlc_actions[];
+extern const size_t libvlc_actions_count;
 extern int vlc_key_to_action (vlc_object_t *, const char *,
                               vlc_value_t, vlc_value_t, void *);
 
@@ -48,23 +51,25 @@ void system_End       ( libvlc_int_t * );
 #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
  */
 
+/* This cannot be used as is from plugins: */
+void vlc_detach (vlc_thread_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_threads_setup (libvlc_int_t *);
+
 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)
+void vlc_assert_locked (vlc_mutex_t *);
 #else
 # define vlc_assert_locked( m ) (void)m
 #endif
@@ -85,8 +90,7 @@ uint32_t CPUCapabilities( void );
 typedef struct msg_bank_t
 {
     /** Message queue lock */
-    vlc_mutex_t lock;
-    vlc_cond_t  wait;
+    vlc_rwlock_t lock;
 
     /* Subscribers */
     int i_sub;
@@ -154,6 +158,8 @@ module_t *module_find_by_shortcut (const char *psz_shortcut);
 typedef struct vlc_object_internals_t
 {
     int             i_object_type; /* Object type, deprecated */
+    char           *psz_object_name; /* module name */
+    /* ^^ can only used from the thread that called module_(un)need() */
 
     /* Object variables */
     variable_t *    p_vars;
@@ -197,10 +203,6 @@ 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
-    char *             psz_configfile;   ///< location of config file
-
     int                i_last_input_id ; ///< Last id of input item
 
     /* Messages */
@@ -220,13 +222,16 @@ typedef struct libvlc_priv_t
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     playlist_t        *p_playlist; //< the playlist singleton
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
-    interaction_t     *p_interaction;    ///< old interaction object
-    intf_thread_t     *p_interaction_intf; ///< old interface for interaction
     vlc_object_t      *p_dialog_provider; ///< dialog provider
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
 #ifdef ENABLE_SOUT
     sap_handler_t     *p_sap; ///< SAP SDP advertiser
 #endif
+
+    /* Interfaces */
+    struct intf_thread_t *p_intf; ///< Interfaces linked-list
+
+    /* Objects tree */
     vlc_mutex_t        structure_lock;
 } libvlc_priv_t;
 
@@ -236,6 +241,7 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
 }
 
 void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
+void intf_DestroyAll( libvlc_int_t * );
 
 #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)