Fix Metacube header handling with multiple header blocks.

[vlc] / src / libvlc.h

diff --git a/src/libvlc.h b/src/libvlc.h
index ebc68c98a2618c414db5dd045f74e837bc49f651..b2046140860d4849fd3d7b2ee042616f2192d3c8 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -41,7 +41,7 @@ size_t vlc_towc (const char *str, uint32_t *restrict pwc);
  */
 void system_Init      ( void );
 void system_Configure ( libvlc_int_t *, int, const char *const [] );
-#if defined(WIN32) || defined(__OS2__)
+#if defined(_WIN32) || defined(__OS2__)
 void system_End(void);
 #ifndef __OS2__
 size_t EnumClockSource( vlc_object_t *, const char *, char ***, char *** );
@@ -58,8 +58,7 @@ void vlc_CPU_dump(vlc_object_t *);
 int vlc_clone_detach (vlc_thread_t *, void *(*)(void *), void *, int);
 
 int vlc_object_waitpipe (vlc_object_t *obj);
-void vlc_object_kill (vlc_object_t *) VLC_DEPRECATED;
-#define vlc_object_kill(o) vlc_object_kill(VLC_OBJECT(o))
+void ObjectKillChildrens (vlc_object_t *);
 
 int vlc_set_priority( vlc_thread_t, int );
 
@@ -74,6 +73,15 @@ void vlc_assert_locked (vlc_mutex_t *);
 # define vlc_assert_locked( m ) (void)m
 #endif
 
+/*
+ * Logging
+ */
+typedef struct vlc_logger_t vlc_logger_t;
+
+int vlc_LogPreinit(libvlc_int_t *);
+int vlc_LogInit(libvlc_int_t *);
+void vlc_LogDeinit(libvlc_int_t *);
+
 /*
  * LibVLC exit event handling
  */
@@ -132,8 +140,6 @@ module_t *module_find_by_shortcut (const char *psz_shortcut);
 #define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original")
 #define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double")
 
-typedef struct sap_handler_t sap_handler_t;
-
 /**
  * Private LibVLC instance data.
  */
@@ -141,25 +147,17 @@ typedef struct libvlc_priv_t
 {
     libvlc_int_t       public_data;
 
-    /* Messages */
-    signed char        i_verbose;   ///< info messages
-    bool               b_color;     ///< color messages?
+    /* Logging */
     bool               b_stats;     ///< Whether to collect stats
 
     /* Singleton objects */
-    playlist_t        *p_playlist; ///< the playlist singleton
-    struct media_library_t *p_ml;    ///< the ML singleton
-    vlc_mutex_t       ml_lock; ///< Mutex for ML creation
+    vlc_logger_t      *logger;
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     vlc_object_t      *p_dialog_provider; ///< dialog provider
-#ifdef ENABLE_SOUT
-    sap_handler_t     *p_sap; ///< SAP SDP advertiser
-#endif
+    struct playlist_t *playlist; ///< Playlist for interfaces
+    struct playlist_preparser_t *parser; ///< Input item meta data handler
     struct vlc_actions *actions; ///< Hotkeys handler
 
-    /* Interfaces */
-    struct intf_thread_t *p_intf; ///< Interfaces linked-list
-
     /* Objects tree */
     vlc_mutex_t        structure_lock;
 
@@ -172,7 +170,8 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
     return (libvlc_priv_t *)libvlc;
 }
 
-void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
+void intf_InsertItem(libvlc_int_t *, const char *mrl, unsigned optc,
+                     const char * const *optv, unsigned flags);
 void intf_DestroyAll( libvlc_int_t * );
 
 #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)