X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcontrol%2Fplaylist.c;h=8e98dbcc521b8d783cbbc4d7c8d9c1f8a70b180a;hb=ee7537e77ae5c190881227db774a1eee6c1c7aa8;hp=eaa60d0def512f9ee56eab0c4b9f99d807dc9b9c;hpb=e1314822f89534929e65a669ffad9dd70e02d4ef;p=vlc

diff --git a/src/control/playlist.c b/src/control/playlist.c
index eaa60d0def..8e98dbcc52 100644
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include "libvlc_internal.h"
+
 #include <vlc/libvlc.h>
 #include <vlc_playlist.h>
 
@@ -29,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 )
 {
@@ -48,9 +49,11 @@ static inline void playlist_mark_locked( libvlc_instance_t *p_instance,
     vlc_mutex_unlock( &p_instance->instance_lock );
 }
 
-void libvlc_playlist_loop( libvlc_instance_t *p_instance, vlc_bool_t loop,
+void libvlc_playlist_loop( libvlc_instance_t *p_instance, int loop,
                            libvlc_exception_t *p_e)
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     var_SetBool( PL, "loop", loop );
 }
@@ -59,6 +62,8 @@ 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(i_options); VLC_UNUSED(ppsz_options);
+
     int did_lock = 0;
     assert( PL );
     ///\todo Handle additionnal options
@@ -70,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;
         }
 
@@ -80,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, VLC_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 );
         }
     }
@@ -123,6 +128,8 @@ void libvlc_playlist_stop( libvlc_instance_t *p_instance,
 void libvlc_playlist_clear( libvlc_instance_t *p_instance,
                             libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     playlist_Clear( PL, playlist_was_locked( p_instance ) );
 }
@@ -165,7 +172,7 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
     }
     return playlist_AddExt( PL, psz_uri, psz_name,
                             PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
-                            i_options, 1, VLC_FALSE );
+                            i_options, 1, false );
 }
 
 
@@ -186,6 +193,8 @@ int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
 int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
                                libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     return playlist_IsPlaying( PL );
 }
@@ -193,14 +202,27 @@ int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
 int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
                                  libvlc_exception_t *p_e )
 {
+    VLC_UNUSED(p_e);
+
     assert( PL );
     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;
 }
 
@@ -208,20 +230,30 @@ 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_instance_t * libvlc_playlist_get_media_instance(
+libvlc_media_player_t * libvlc_playlist_get_media_player(
                                 libvlc_instance_t *p_instance,
                                 libvlc_exception_t *p_e )
 {
-    libvlc_media_instance_t *p_mi;
+    libvlc_media_player_t *p_mi;
     assert( PL );
 
-    vlc_mutex_lock( &PL->object_lock );
-    p_mi = libvlc_media_instance_new_from_input_thread(
-                        p_instance, PL->p_input, p_e );
-    vlc_mutex_unlock( &PL->object_lock );
+    vlc_object_lock( PL );
+    if( PL->p_input )
+    {
+        p_mi = libvlc_media_player_new_from_input_thread(
+                            p_instance, PL->p_input, p_e );
+    }
+    else
+    {
+        /* no active input */
+        p_mi = NULL;
+        libvlc_exception_raise( p_e, "No active input" );
+    }
+    vlc_object_unlock( PL );
 
     return p_mi;
 }
+