X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcontrol%2Fplaylist.c;h=988721f68014da6ec23d868ebe2dc77573edc09e;hb=f64fd9acd66302b78d0282bcdb3011b4c6906733;hp=cfe82b498b06798cd42e29056a3257296ed214e5;hpb=799b2826ee321796c8c4695c5a7b7489ed5da851;p=vlc

diff --git a/src/control/playlist.c b/src/control/playlist.c
index cfe82b498b..988721f680 100644
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -21,50 +21,92 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <libvlc_internal.h>
+#include "libvlc_internal.h"
 #include <vlc/libvlc.h>
-
-#include <vlc/intf.h>
+#include <vlc_playlist.h>
 
 #include <assert.h>
 
+#include "../playlist/playlist_internal.h"
+
 #define PL p_instance->p_libvlc_int->p_playlist
 
+static inline int playlist_was_locked( libvlc_instance_t *p_instance )
+{
+    int was_locked;
+    vlc_mutex_lock( &p_instance->instance_lock );
+    was_locked = p_instance->b_playlist_locked;
+    vlc_mutex_unlock( &p_instance->instance_lock );
+    return was_locked;
+}
+
+static inline void playlist_mark_locked( libvlc_instance_t *p_instance,
+                                         int locked )
+{
+    vlc_mutex_lock( &p_instance->instance_lock );
+    p_instance->b_playlist_locked = locked;
+    vlc_mutex_unlock( &p_instance->instance_lock );
+}
+
 void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop,
                            libvlc_exception_t *p_e)
 {
     assert( PL );
-    var_SetBool(PL,"loop",loop);
+    var_SetBool( PL, "loop", loop );
 }
 
 void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                            int i_options, char **ppsz_options,
                            libvlc_exception_t *p_e )
 {
+    int did_lock = 0;
     assert( PL );
     ///\todo Handle additionnal options
 
     if( PL->items.i_size == 0 ) RAISEVOID( "Empty playlist" );
     if( i_id > 0 )
     {
-        playlist_item_t *p_item = playlist_ItemGetById( PL,
-                                                        i_id );
-        if( !p_item ) RAISEVOID( "Unable to find item" );
-
-        playlist_LockControl( PL, PLAYLIST_VIEWPLAY,
-                              PL->status.p_node, p_item );
+        playlist_item_t *p_item;
+        if (! playlist_was_locked( p_instance ) )
+        {
+            playlist_mark_locked( p_instance, 1 );
+            vlc_mutex_lock( &PL->object_lock );
+            did_lock = 1;
+        }
+
+        p_item = playlist_ItemGetByInputId( PL, i_id,
+                                            PL->status.p_node );
+        if( !p_item )
+        {
+            if( did_lock == 1 )
+            {
+                vlc_mutex_unlock( &PL->object_lock );
+                playlist_mark_locked( p_instance, 0 );
+            }
+            RAISEVOID( "Unable to find item" );
+        }
+
+        playlist_Control( PL, PLAYLIST_VIEWPLAY, VLC_TRUE,
+                          PL->status.p_node, p_item );
+        if( did_lock == 1 )
+        {
+            vlc_mutex_unlock( &PL->object_lock );
+            playlist_mark_locked( p_instance, 0 );
+        }
     }
     else
     {
-        playlist_Play( PL );
+        playlist_Control( PL, PLAYLIST_PLAY,
+                          playlist_was_locked( p_instance ) );
     }
 }
 
 void libvlc_playlist_pause( libvlc_instance_t *p_instance,
-                           libvlc_exception_t *p_e )
+                            libvlc_exception_t *p_e )
 {
     assert( PL );
-    if( playlist_Pause( PL ) != VLC_SUCCESS )
+    if( playlist_Control( PL, PLAYLIST_PAUSE,
+                          playlist_was_locked( p_instance ) ) != VLC_SUCCESS )
         RAISEVOID( "Empty playlist" );
 }
 
@@ -73,29 +115,32 @@ void libvlc_playlist_stop( libvlc_instance_t *p_instance,
                            libvlc_exception_t *p_e )
 {
     assert( PL );
-    if( playlist_Stop( PL ) != VLC_SUCCESS )
+    if( playlist_Control( PL, PLAYLIST_STOP,
+                          playlist_was_locked( p_instance ) ) != VLC_SUCCESS )
         RAISEVOID( "Empty playlist" );
 }
 
 void libvlc_playlist_clear( libvlc_instance_t *p_instance,
-                           libvlc_exception_t *p_e )
+                            libvlc_exception_t *p_e )
 {
     assert( PL );
-    playlist_Clear( PL );
+    playlist_Clear( PL, playlist_was_locked( p_instance ) );
 }
 
 void libvlc_playlist_next( libvlc_instance_t *p_instance,
                            libvlc_exception_t *p_e )
 {
     assert( PL );
-    if( playlist_Next( PL ) != VLC_SUCCESS )
+    if( playlist_Control( PL, PLAYLIST_SKIP, playlist_was_locked( p_instance ),
+                          1 ) != VLC_SUCCESS )
         RAISEVOID( "Empty playlist" );
 }
 
 void libvlc_playlist_prev( libvlc_instance_t *p_instance,
                            libvlc_exception_t *p_e )
 {
-    if( playlist_Prev( PL ) != VLC_SUCCESS )
+    if( playlist_Control( PL, PLAYLIST_SKIP, playlist_was_locked( p_instance ),
+                          -1  ) != VLC_SUCCESS )
         RAISEVOID( "Empty playlist" );
 }
 
@@ -112,18 +157,31 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
                                   libvlc_exception_t *p_e )
 {
     assert( PL );
-    return playlist_PlaylistAddExt( PL, psz_uri, psz_name,
+    if( playlist_was_locked( p_instance ) )
+    {
+        libvlc_exception_raise( p_e, "You must unlock playlist before "
+                               "calling libvlc_playlist_add" );
+        return VLC_EGENERIC;
+    }
+    return playlist_AddExt( PL, psz_uri, psz_name,
                             PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
-                            i_options );
+                            i_options, 1, VLC_FALSE );
 }
 
+
 int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
                                  libvlc_exception_t *p_e )
 {
     assert( PL );
-    return playlist_DeleteFromItemId( PL, i_id );
-}
 
+    if( playlist_DeleteFromInput( PL, i_id,
+                                  playlist_was_locked( p_instance ) ) )
+    {
+        libvlc_exception_raise( p_e, "deletion failed" );
+        return VLC_ENOITEM;
+    }
+    return VLC_SUCCESS;
+}
 
 int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
                                libvlc_exception_t *p_e )
@@ -136,9 +194,25 @@ int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
                                  libvlc_exception_t *p_e )
 {
     assert( PL );
-    return PL->items.i_size;
+    return playlist_CurrentSize( PL );
+}
+
+void libvlc_playlist_lock( libvlc_instance_t *p_instance )
+{
+    assert( PL );
+    vlc_mutex_lock( &PL->object_lock );
+    p_instance->b_playlist_locked = 1;
 }
 
+void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
+{
+    assert( PL );
+    p_instance->b_playlist_locked = 0;
+    vlc_mutex_unlock( &PL->object_lock );
+}
+
+
+
 libvlc_input_t * libvlc_playlist_get_input( libvlc_instance_t *p_instance,
                                             libvlc_exception_t *p_e )
 {