libvlc_run_interface -> libvlc_add_intf (non-blocking)

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index 0daa8af5f55790298e06f268e39354fc03d6c609..d8232d11a4be258ecde0e853f52903b595d4cb5e 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -71,7 +71,7 @@ static void libvlc_exception_not_handled( const char *psz )
 }
 
 void libvlc_exception_raise( libvlc_exception_t *p_exception,
-                                           const char *psz_format, ... )
+                             const char *psz_format, ... )
 {
     va_list args;
     char * psz;
@@ -131,8 +131,6 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     p_new->p_callback_list = NULL;
     vlc_mutex_init(&p_new->instance_lock);
     vlc_mutex_init(&p_new->event_callback_lock);
- 
-    libvlc_event_init(p_new, p_e);
 
     return p_new;
 }
@@ -156,8 +154,6 @@ void libvlc_release( libvlc_instance_t *p_instance )
 
     vlc_mutex_lock( lock );
     refs = --p_instance->ref_count;
-    if( refs == 0 )
-        libvlc_event_fini( p_instance );
     vlc_mutex_unlock( lock );
 
     if( refs == 0 )
@@ -170,13 +166,21 @@ void libvlc_release( libvlc_instance_t *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, false, true, 0, NULL ) )
         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_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;