libvlc: Don't wait if p_libvlc is dying in libvlc_wait().

[vlc] / src / control / core.c

diff --git a/src/control/core.c b/src/control/core.c
index c967c39c9ea1582cfc941f15972fd60b1ee0f986..d7b220c2235d22de9c0730573e0dc0751f66a1f1 100644 (file)
--- a/src/control/core.c
+++ b/src/control/core.c
@@ -20,6 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
+
 #include "libvlc_internal.h"
 #include <vlc/libvlc.h>
 
@@ -70,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;
@@ -110,12 +111,17 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     p_new = (libvlc_instance_t *)malloc( sizeof( libvlc_instance_t ) );
     if( !p_new ) RAISENULL( "Out of memory" );
 
+    const char *my_argv[argc + 2];
+
+    my_argv[0] = "libvlc"; /* dummy arg0, skipped by getopt() et al */
+    for( int i = 0; i < argc; i++ )
+         my_argv[i + 1] = argv[i];
+    my_argv[argc + 1] = NULL; /* C calling conventions require a NULL */
+
     /** \todo Look for interface settings. If we don't have any, add -I dummy */
     /* Because we probably don't want a GUI by default */
 
-    /* WARNING: caller must pass a program path in argv[0], which can be a dummy path
-     *          this is used by libvlc to locate, this is leveraged by plugins */
-    if( libvlc_InternalInit( p_libvlc_int, argc, argv ) )
+    if( libvlc_InternalInit( p_libvlc_int, argc + 1, my_argv ) )
         RAISENULL( "VLC initialization failed" );
 
     p_new->p_libvlc_int = p_libvlc_int;
@@ -123,10 +129,8 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv,
     p_new->b_playlist_locked = 0;
     p_new->ref_count = 1;
     p_new->p_callback_list = NULL;
-    vlc_mutex_init(p_libvlc_int, &p_new->instance_lock);
-    vlc_mutex_init(p_libvlc_int, &p_new->event_callback_lock);
- 
-    libvlc_event_init(p_new, p_e);
+    vlc_mutex_init(&p_new->instance_lock);
+    vlc_mutex_init(&p_new->event_callback_lock);
 
     return p_new;
 }
@@ -150,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 )
@@ -159,12 +161,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, VLC_FALSE );
+        libvlc_InternalDestroy( p_instance->p_libvlc_int, false );
         free( 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 ) )
+        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 );
+    if( vlc_object_alive( 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;
 }
+
+const char * libvlc_get_version()
+{
+    return VLC_Version();
+}
+
+const char * libvlc_get_compiler()
+{
+    return VLC_Compiler();
+}
+
+const char * libvlc_get_changeset()
+{
+    return VLC_Changeset();
+}