Merge branch '0.9.0-libass' of git://git.videolan.org/vlc

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index ed332e2d323015d93338cc7b3849a008abab579a..9db56144d44321dda1455f95b17e01f0dc2cebf7 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -84,13 +84,13 @@ void libvlc_exception_raise( libvlc_exception_t *p_exception,
 
     /* Does caller care about exceptions ? */
     if( p_exception == NULL ) {
-        /* Print something, so lazy third-parties can easily
-         * notice that something may have gone unoticedly wrong */
+        /* Print something, so that lazy third-parties can easily
+         * notice that something may have gone unnoticedly wrong */
         libvlc_exception_not_handled( psz );
         return;
     }
 
-    /* Make sure that there is no unoticed previous exception */
+    /* Make sure that there is no unnoticed previous exception */
     if( p_exception->b_raised )
     {
         libvlc_exception_not_handled( p_exception->psz_message );
@@ -104,7 +104,7 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
                                 libvlc_exception_t *p_e )
 {
     libvlc_instance_t *p_new;
-
+    int i_ret;
     libvlc_int_t *p_libvlc_int = libvlc_InternalCreate();
     if( !p_libvlc_int ) RAISENULL( "VLC initialization failed" );
 
@@ -121,7 +121,10 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     /** \todo Look for interface settings. If we don't have any, add -I dummy */
     /* Because we probably don't want a GUI by default */
 
-    if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
+    i_ret=libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv );
+    if( i_ret == VLC_EEXITSUCCESS )
+            return NULL;
+    else if( i_ret != 0 )
         RAISENULL( "VLC initialization failed" );
 
     p_new->p_libvlc_int = p_libvlc_int;
@@ -161,7 +164,7 @@ void libvlc_release( libvlc_instance_t *p_instance )
         vlc_mutex_destroy( lock );
         vlc_mutex_destroy( &p_instance->event_callback_lock );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
-        libvlc_InternalDestroy( p_instance->p_libvlc_int, false );
+        libvlc_InternalDestroy( p_instance->p_libvlc_int );
         free( p_instance );
     }
 }
@@ -169,7 +172,7 @@ void libvlc_release( libvlc_instance_t *p_instance )
 void libvlc_add_intf( libvlc_instance_t *p_i, const char *name,
                       libvlc_exception_t *p_e )
 {
-    if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name, false, true, 0, NULL ) )
+    if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
         RAISEVOID( "Interface initialization failed" );
 }
 
@@ -187,17 +190,17 @@ int libvlc_get_vlc_id( libvlc_instance_t *p_instance )
     return p_instance->p_libvlc_int->i_object_id;
 }
 
-const char * libvlc_get_version()
+const char * libvlc_get_version(void)
 {
     return VLC_Version();
 }
 
-const char * libvlc_get_compiler()
+const char * libvlc_get_compiler(void)
 {
     return VLC_Compiler();
 }
 
-const char * libvlc_get_changeset()
+const char * libvlc_get_changeset(void)
 {
     return VLC_Changeset();
 }