Use pl_Locked and pl_Unlocked.

[vlc] / src / control / playlist.c

diff --git a/src/control/playlist.c b/src/control/playlist.c
index bc2dc4b9b514578139c700018674a5c7c8899487..8e98dbcc521b8d783cbbc4d7c8d9c1f8a70b180a 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -30,7 +30,7 @@
 
 #include "../playlist/playlist_internal.h"
 
-#define PL p_instance->p_libvlc_int->p_playlist
+#define PL (libvlc_priv (p_instance->p_libvlc_int)->p_playlist)
 
 static inline int playlist_was_locked( libvlc_instance_t *p_instance )
 {
@@ -62,7 +62,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
                            int i_options, char **ppsz_options,
                            libvlc_exception_t *p_e )
 {
-    VLC_UNUSED(p_e);
+    VLC_UNUSED(p_e); VLC_UNUSED(i_options); VLC_UNUSED(ppsz_options);
 
     int did_lock = 0;
     assert( PL );
@@ -75,7 +75,7 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
         if (! playlist_was_locked( p_instance ) )
         {
             playlist_mark_locked( p_instance, 1 );
-            vlc_mutex_lock( &PL->object_lock );
+            vlc_object_lock( PL );
             did_lock = 1;
         }
 
@@ -85,17 +85,17 @@ void libvlc_playlist_play( libvlc_instance_t *p_instance, int i_id,
         {
             if( did_lock == 1 )
             {
-                vlc_mutex_unlock( &PL->object_lock );
+                vlc_object_unlock( PL );
                 playlist_mark_locked( p_instance, 0 );
             }
             RAISEVOID( "Unable to find item" );
         }
 
-        playlist_Control( PL, PLAYLIST_VIEWPLAY, true,
+        playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
                           PL->status.p_node, p_item );
         if( did_lock == 1 )
         {
-            vlc_mutex_unlock( &PL->object_lock );
+            vlc_object_unlock( PL );
             playlist_mark_locked( p_instance, 0 );
         }
     }
@@ -208,10 +208,21 @@ int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
     return playlist_CurrentSize( PL );
 }
 
+int libvlc_playlist_get_current_index ( libvlc_instance_t *p_instance,
+                                        libvlc_exception_t *p_e )
+{
+    VLC_UNUSED(p_e);
+
+    assert( PL );
+    if( !PL->status.p_item )
+        return -1;
+    return playlist_CurrentId( PL );
+}
+
 void libvlc_playlist_lock( libvlc_instance_t *p_instance )
 {
     assert( PL );
-    vlc_mutex_lock( &PL->object_lock );
+    vlc_object_lock( PL );
     p_instance->b_playlist_locked = 1;
 }
 
@@ -219,7 +230,7 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
 {
     assert( PL );
     p_instance->b_playlist_locked = 0;
-    vlc_mutex_unlock( &PL->object_lock );
+    vlc_object_unlock( PL );
 }
 
 libvlc_media_player_t * libvlc_playlist_get_media_player(
@@ -229,7 +240,7 @@ libvlc_media_player_t * libvlc_playlist_get_media_player(
     libvlc_media_player_t *p_mi;
     assert( PL );
 
-    vlc_mutex_lock( &PL->object_lock );
+    vlc_object_lock( PL );
     if( PL->p_input )
     {
         p_mi = libvlc_media_player_new_from_input_thread(
@@ -241,7 +252,7 @@ libvlc_media_player_t * libvlc_playlist_get_media_player(
         p_mi = NULL;
         libvlc_exception_raise( p_e, "No active input" );
     }
-    vlc_mutex_unlock( &PL->object_lock );
+    vlc_object_unlock( PL );
 
     return p_mi;
 }