X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=65f0d6d985cd0660b34c6eaf1e18356b9af77d3f;hb=908a51341bfa366f5ec7b650d32e423ae38ac5f0;hp=b939faac398ee45b1202d5dc70ab70c009126233;hpb=aa1a821d4f2280400aefee8f21407793e2707351;p=vlc

diff --git a/src/libvlc.h b/src/libvlc.h
index b939faac39..65f0d6d985 100644
--- 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 );
 
@@ -150,18 +149,15 @@ typedef struct libvlc_priv_t
     /* Logging */
     struct
     {
-        void (*cb) (void *, int, const msg_item_t *, const char *, va_list);
+        void (*cb) (void *, int, const vlc_log_t *, const char *, va_list);
         void *opaque;
+        signed char verbose;
         vlc_rwlock_t lock;
     } log;
-    signed char        i_verbose;   ///< info messages
-    bool               b_color;     ///< color messages?
     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
     vlm_t             *p_vlm;  ///< the VLM singleton (or NULL)
     vlc_object_t      *p_dialog_provider; ///< dialog provider
 #ifdef ENABLE_SOUT