VLC: make sure the playlist exists before starting any interface

This avoids creating the playlist from the UI mainloop, which is not
typically a good idea.

diff --git a/lib/core.c b/lib/core.c
index 9fc0697958292b12f31d2a8fd167ec2d34b50d0c..411bdc5749345c932e49b333742e68d053676403 100644 (file)
--- a/lib/core.c
+++ b/lib/core.c
@@ -111,24 +111,6 @@ void libvlc_release( libvlc_instance_t *p_instance )
     }
 }
 
-int libvlc_add_intf( libvlc_instance_t *p_i, const char *name )
-{
-    if( libvlc_InternalAddIntf( p_i->p_libvlc_int, name ))
-    {
-        if( name )
-        {
-            libvlc_printerr("interface \"%s\" initialization failed",
-                name );
-        }
-        else
-        {
-            libvlc_printerr("default interface initialization failed");
-        }
-        return -1;
-    }
-    return 0;
-}
-
 void libvlc_set_exit_handler( libvlc_instance_t *p_i, void (*cb) (void *),
                               void *data )
 {

diff --git a/lib/playlist.c b/lib/playlist.c
index 6fe1b314443389407516fa9969be8bd04b926fb6..698d66b49066e00f76f781a3a6ce8cbaf6d10b94 100644 (file)
--- a/lib/playlist.c
+++ b/lib/playlist.c
@@ -50,3 +50,18 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
         return;
     playlist_Control( pl, PLAYLIST_PLAY, false );
 }
+
+int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name )
+{
+    pl_Get (p_instance->p_libvlc_int);
+
+    if( libvlc_InternalAddIntf( p_instance->p_libvlc_int, name ))
+    {
+        if( name != NULL )
+            libvlc_printerr("interface \"%s\" initialization failed", name );
+        else
+            libvlc_printerr("default interface initialization failed");
+        return -1;
+    }
+    return 0;
+}