Fix HTTP deletion

diff --git a/modules/control/http/macro.c b/modules/control/http/macro.c
index 8c3eae1cefdfa689786bf3e0892acd1fa0c59ca1..7f9d9a1ecfe54c100d5f570329c5d152964d8a21 100644 (file)
--- a/modules/control/http/macro.c
+++ b/modules/control/http/macro.c
@@ -368,7 +368,8 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
                         int i;
                         for( i = 0; i < i_nb_items; i++ )
                         {
-                            playlist_LockDelete( p_sys->p_playlist, p_items[i] );
+                            playlist_LockDeleteAllFromInput( p_sys->p_playlist,
+                                                             p_items[i] );
                             msg_Dbg( p_intf, "requested playlist delete: %d",
                                      p_items[i] );
                             p_items[i] = -1;
@@ -408,7 +409,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
                         }
                         if( j == i_nb_items )
                         {
-                            playlist_LockDelete( p_sys->p_playlist,
+                            playlist_LockDeleteAllFromInput( p_sys->p_playlist,
                             p_sys->p_playlist->pp_items[i]->p_input->i_id );
                             msg_Dbg( p_intf, "requested playlist delete: %d",
                                      i );

diff --git a/modules/control/http/rpn.c b/modules/control/http/rpn.c
index 598b874c5973bd4678b91f80eebf5ff0d9bf6fd9..c3de10f176ed2d57d55c4ad78b96c5abafcde7d0 100644 (file)
--- a/modules/control/http/rpn.c
+++ b/modules/control/http/rpn.c
@@ -869,7 +869,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t  *vars,
         else if( !strcmp( s, "playlist_delete" ) )
         {
             int i_id = E_(SSPopN)( st, vars );
-            playlist_LockDelete( p_sys->p_playlist, i_id );
+            playlist_LockDeleteAllFromInput( p_sys->p_playlist, i_id );
             msg_Dbg( p_intf, "requested playlist delete: %d", i_id );
         }
         else if( !strcmp( s, "playlist_move" ) )