X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.c;h=d62a2a9e5a1896f93b4082384b69e8e346e28b21;hb=6add489cc23d8c2a57e39ae5dbc1475ba982edc7;hp=a8c72bfe7037dd9f8a7037684ec53f6f6fd3a788;hpb=85ff1461a28b5ec29f881aaaa960a242750704fb;p=vlc

diff --git a/src/libvlc.c b/src/libvlc.c
index a8c72bfe70..d62a2a9e5a 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * libvlc.c: Implementation of the old libvlc API
  *****************************************************************************
- * Copyright (C) 1998-2006 the VideoLAN team
+ * Copyright (C) 1998-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -38,6 +38,7 @@
 #include <vlc/vlc.h>
 
 #include "control/libvlc_internal.h"
+#include "libvlc.h"
 
 #include <vlc_playlist.h>
 
@@ -69,13 +70,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
@@ -116,7 +115,7 @@ int VLC_Create( void )
  *  - message queue, module bank and playlist initialization
  *  - configuration and commandline parsing
  *****************************************************************************/
-int VLC_Init( int i_object, int i_argc, char *ppsz_argv[] )
+int VLC_Init( int i_object, int i_argc, const char *ppsz_argv[] )
 {
     int i_ret;
     LIBVLC_FUNC;
@@ -149,13 +148,13 @@ int VLC_AddIntf( int i_object, char const *psz_module,
 /*****************************************************************************
  * VLC_Die: ask vlc to die.
  *****************************************************************************
- * This function sets p_vlc->b_die to VLC_TRUE, but does not do any other
+ * This function sets p_libvlc->b_die to VLC_TRUE, but does not do any other
  * task. It is your duty to call VLC_CleanUp and VLC_Destroy afterwards.
  *****************************************************************************/
 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;
 }
@@ -654,6 +653,7 @@ float VLC_SpeedSlower( int i_object )
  */
 int VLC_PlaylistIndex( int i_object )
 {
+    (void)i_object;
     printf( "This function is deprecated and should not be used anymore" );
     return -1;
 }