new cannot return NULL per ISO C++

[vlc] / src / control / playlist.c

diff --git a/src/control/playlist.c b/src/control/playlist.c
index ae9217fa543cdf82bd87790ac8f2c5ebc1f22db7..4f354addb36fb46e6b287f34e6c1df428fcfd044 100644 (file)
--- a/src/control/playlist.c
+++ b/src/control/playlist.c
@@ -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,27 +75,21 @@ 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 );
+            playlist_Lock( PL );
             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 );
-            }
+                                            PL->p_root_category );
+        if( p_item )
+            playlist_Control( PL, PLAYLIST_VIEWPLAY, pl_Locked,
+                              PL->p_root_category, p_item );
+       else
             RAISEVOID( "Unable to find item" );
-        }
 
-        playlist_Control( PL, PLAYLIST_VIEWPLAY, true,
-                          PL->status.p_node, p_item );
         if( did_lock == 1 )
         {
-            vlc_mutex_unlock( &PL->object_lock );
+            playlist_Unlock( PL );
             playlist_mark_locked( p_instance, 0 );
         }
     }
@@ -158,10 +152,11 @@ int libvlc_playlist_add( libvlc_instance_t *p_instance, const char *psz_uri,
                                          0, NULL, p_e );
 }
 
-int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
-                                  const char *psz_uri, const char *psz_name,
-                                  int i_options, const char **ppsz_options,
-                                  libvlc_exception_t *p_e )
+static int PlaylistAddExtended( libvlc_instance_t *p_instance,
+                                const char *psz_uri, const char *psz_name,
+                                int i_options, const char **ppsz_options,
+                                unsigned i_option_flags,
+                                libvlc_exception_t *p_e )
 {
     assert( PL );
     if( playlist_was_locked( p_instance ) )
@@ -171,10 +166,28 @@ int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
         return VLC_EGENERIC;
     }
     return playlist_AddExt( PL, psz_uri, psz_name,
-                            PLAYLIST_INSERT, PLAYLIST_END, -1, ppsz_options,
-                            i_options, 1, false );
+                            PLAYLIST_INSERT, PLAYLIST_END, -1,
+                            i_options, ppsz_options, i_option_flags,
+                            true, pl_Unlocked );
+}
+int libvlc_playlist_add_extended( libvlc_instance_t *p_instance,
+                                  const char *psz_uri, const char *psz_name,
+                                  int i_options, const char **ppsz_options,
+                                  libvlc_exception_t *p_e )
+{
+    return PlaylistAddExtended( p_instance, psz_uri, psz_name,
+                                i_options, ppsz_options, VLC_INPUT_OPTION_TRUSTED,
+                                p_e );
+}
+int libvlc_playlist_add_extended_untrusted( libvlc_instance_t *p_instance,
+                                            const char *psz_uri, const char *psz_name,
+                                            int i_options, const char **ppsz_options,
+                                            libvlc_exception_t *p_e )
+{
+    return PlaylistAddExtended( p_instance, psz_uri, psz_name,
+                                i_options, ppsz_options, 0,
+                                p_e );
 }
-
 
 int libvlc_playlist_delete_item( libvlc_instance_t *p_instance, int i_id,
                                  libvlc_exception_t *p_e )
@@ -196,7 +209,7 @@ int libvlc_playlist_isplaying( libvlc_instance_t *p_instance,
     VLC_UNUSED(p_e);
 
     assert( PL );
-    return playlist_IsPlaying( PL );
+    return playlist_Status( PL ) == PLAYLIST_RUNNING;
 }
 
 int libvlc_playlist_items_count( libvlc_instance_t *p_instance,
@@ -208,10 +221,22 @@ 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 );
+    playlist_item_t *p_item = playlist_CurrentPlayingItem( PL );
+    if( !p_item )
+        return -1;
+    return p_item->i_id;
+}
+
 void libvlc_playlist_lock( libvlc_instance_t *p_instance )
 {
     assert( PL );
-    vlc_mutex_lock( &PL->object_lock );
+    playlist_Lock( PL );
     p_instance->b_playlist_locked = 1;
 }
 
@@ -219,7 +244,7 @@ void libvlc_playlist_unlock( libvlc_instance_t *p_instance )
 {
     assert( PL );
     p_instance->b_playlist_locked = 0;
-    vlc_mutex_unlock( &PL->object_lock );
+    playlist_Unlock( PL );
 }
 
 libvlc_media_player_t * libvlc_playlist_get_media_player(
@@ -228,12 +253,12 @@ libvlc_media_player_t * libvlc_playlist_get_media_player(
 {
     libvlc_media_player_t *p_mi;
     assert( PL );
-
-    vlc_mutex_lock( &PL->object_lock );
-    if( PL->p_input )
+    input_thread_t * input = playlist_CurrentInput( PL );
+    if( input )
     {
         p_mi = libvlc_media_player_new_from_input_thread(
-                            p_instance, PL->p_input, p_e );
+                            p_instance, input, p_e );
+        vlc_object_release( input );
     }
     else
     {
@@ -241,7 +266,6 @@ 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 );
 
     return p_mi;
 }