lib: add helper for playlist startup

Also remove a useless and unsynchronized test.

diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h
index 760649e34fd5103dc26a1420f724103e7e385ed0..64585a71a80a49baddf7160cf9ce81e2c93a3528 100644 (file)
--- a/lib/libvlc_internal.h
+++ b/lib/libvlc_internal.h
@@ -49,6 +49,7 @@ VLC_API void libvlc_InternalCleanup( libvlc_int_t * );
 VLC_API void libvlc_InternalDestroy( libvlc_int_t * );
 
 VLC_API int libvlc_InternalAddIntf( libvlc_int_t *, const char * );
+VLC_API void libvlc_InternalPlay( libvlc_int_t * );
 VLC_API void libvlc_InternalWait( libvlc_int_t * );
 VLC_API void libvlc_SetExitHandler( libvlc_int_t *, void (*) (void *), void * );
 

diff --git a/lib/playlist.c b/lib/playlist.c
index 03bce9b234bafecb7b204af2c3ffb9e04808eee1..c0e610fa528a709e6a1e66559272784e698dd64f 100644 (file)
--- a/lib/playlist.c
+++ b/lib/playlist.c
@@ -41,14 +41,8 @@
 void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                            int i_options, char **ppsz_options )
 {
-    playlist_t *pl = pl_Get (p_instance->p_libvlc_int);
+    libvlc_InternalPlay( p_instance->p_libvlc_int );
     VLC_UNUSED(i_id); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
-
-    assert( pl );
-    if( !var_GetBool( pl, "playlist-autostart" )
-     || pl->items.i_size == 0 )
-        return;
-    playlist_Control( pl, PLAYLIST_PLAY, false );
 }
 
 int libvlc_add_intf( libvlc_instance_t *p_instance, const char *name )

diff --git a/src/interface/interface.c b/src/interface/interface.c
index 83b5297951da7cbb2f18e23b242bcad6e8a1cd3e..35446c064c9cd54047d04ffcfde176efd924ba82 100644 (file)
--- a/src/interface/interface.c
+++ b/src/interface/interface.c
@@ -46,6 +46,7 @@
 #include <vlc_playlist.h>
 #include "libvlc.h"
 #include "playlist/playlist_internal.h"
+#include "../lib/libvlc_internal.h"
 
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
@@ -174,6 +175,18 @@ void intf_InsertItem(libvlc_int_t *libvlc, const char *mrl, unsigned optc,
                     0, -1, optc, optv, flags, true, pl_Unlocked);
 }
 
+void libvlc_InternalPlay(libvlc_int_t *libvlc)
+{
+    playlist_t *pl;
+
+    vlc_mutex_lock(&lock);
+    pl = libvlc_priv(libvlc)->playlist;
+    vlc_mutex_unlock(&lock);
+
+    if (pl != NULL && var_GetBool(pl, "playlist-autostart"))
+        playlist_Control(pl, PLAYLIST_PLAY, false);
+}
+
 /**
  * Stops and destroys all interfaces
  * @param p_libvlc the LibVLC instance

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 5a7c56a1ec84599064ebc3e860e755535694b92c..14e26e3b07ddce1fb514b652be2b6d492a293d14 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -224,6 +224,7 @@ input_Close
 intf_Create
 IsUTF8
 libvlc_InternalAddIntf
+libvlc_InternalPlay
 libvlc_InternalCleanup
 libvlc_InternalCreate
 libvlc_InternalDestroy