libvlc event: Make event function thread safe. (And fix a mutex leak)

[vlc] / src / libvlc.c

diff --git a/src/libvlc.c b/src/libvlc.c
index 8cd109e9643b66388789619bda2b3ae54062b331..b515bf1fc1b1ec399e2a36be2680a26e3f5962c4 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -69,13 +69,11 @@ DECLARE_VLC_VERSION( CompileHost, COMPILE_HOST );
 DECLARE_VLC_VERSION( CompileDomain, COMPILE_DOMAIN );
 DECLARE_VLC_VERSION( Compiler, COMPILER );
 
-#ifndef HAVE_SHARED_LIBVLC
 extern const char psz_vlc_changeset[];
-char const * VLC_Changeset( void )
+const char* VLC_Changeset( void )
 {
     return psz_vlc_changeset;
 }
-#endif
 
 /*****************************************************************************
  * VLC_Error: strerror() equivalent
@@ -155,7 +153,7 @@ int VLC_AddIntf( int i_object, char const *psz_module,
 int VLC_Die( int i_object )
 {
     LIBVLC_FUNC;
-    p_libvlc->b_die = VLC_TRUE;
+    vlc_object_kill( p_libvlc );
     LIBVLC_FUNC_END;
     return VLC_SUCCESS;
 }