X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fcore.c;h=9155bc20ae7d34f44f60e75fc46616e75fbda894;hb=e7b0790a8639643acf46060d68e3a3ea9627e174;hp=068ca67fc71cbe67659a6e98a7a04e4b0df08039;hpb=e58c9db65d3556079214df5c81b75a82aba934ae;p=vlc

diff --git a/src/control/core.c b/src/control/core.c
index 068ca67fc7..9155bc20ae 100644
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -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,34 +164,43 @@ 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 );
     }
 }
 
-void libvlc_run_interface( libvlc_instance_t *p_i, const char *name,
-                           libvlc_exception_t *p_e )
+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, true, true, 0, NULL ) )
+    if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ) )
         RAISEVOID( "Interface initialization failed" );
 }
 
+void libvlc_wait( libvlc_instance_t *p_i )
+{
+    libvlc_int_t *p_libvlc = p_i->p_libvlc_int;
+    vlc_object_lock( p_libvlc );
+    while( vlc_object_alive( p_libvlc ) )
+        vlc_object_wait( p_libvlc );
+    vlc_object_unlock( p_libvlc );
+}
+
 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();
 }