Skip to content

V
vlc-1.1
Commit 4963328e authored by Clément Stenac's avatar Clément Stenac
Browse files
Options

Fix HTTP deletion

parent ac471f21
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/control/http/macro.c
View file @ 4963328e
...@@ -368,7 +368,8 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -368,7 +368,8 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
int i; int i;
for( i = 0; i < i_nb_items; 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", msg_Dbg( p_intf, "requested playlist delete: %d",
p_items[i] ); p_items[i] );
p_items[i] = -1; p_items[i] = -1;
...@@ -408,7 +409,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args, ...@@ -408,7 +409,7 @@ void E_(MacroDo)( httpd_file_sys_t *p_args,
} }
if( j == i_nb_items ) 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 ); p_sys->p_playlist->pp_items[i]->p_input->i_id );
msg_Dbg( p_intf, "requested playlist delete: %d", msg_Dbg( p_intf, "requested playlist delete: %d",
i ); i );
......
modules/control/http/rpn.c
View file @ 4963328e
...@@ -869,7 +869,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t *vars, ...@@ -869,7 +869,7 @@ void E_(EvaluateRPN)( intf_thread_t *p_intf, mvar_t *vars,
else if( !strcmp( s, "playlist_delete" ) ) else if( !strcmp( s, "playlist_delete" ) )
{ {
int i_id = E_(SSPopN)( st, vars ); 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 ); msg_Dbg( p_intf, "requested playlist delete: %d", i_id );
} }
else if( !strcmp( s, "playlist_move" ) ) else if( !strcmp( s, "playlist_move" ) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment