X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcontrol%2Frc.c;h=8b3b8d6583bdf48956e1b7231513e08e645a17d6;hb=b751665aa8f78719eb3e4fe30545fffd5c423948;hp=3f79c05827a662e7fd51d93b6a87c43120d17540;hpb=00b95848260cd44f140a05da8aa5baf13580e2d3;p=vlc diff --git a/modules/control/rc.c b/modules/control/rc.c index 3f79c05827..8b3b8d6583 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1417,7 +1417,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, p_item = p_parent = p_playlist->items.p_elems[i_pos*2-1]; while( p_parent->p_parent ) p_parent = p_parent->p_parent; - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_parent, p_item ); } else @@ -1430,7 +1430,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, else if( !strcmp( psz_cmd, "clear" ) ) { playlist_Stop( p_playlist ); - playlist_Clear( p_playlist, false ); + playlist_Clear( p_playlist, pl_Unlocked ); } else if( !strcmp( psz_cmd, "add" ) && newval.psz_string && *newval.psz_string ) @@ -1442,7 +1442,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, msg_rc( "Trying to add %s to playlist.", newval.psz_string ); int i_ret =playlist_AddInput( p_playlist, p_item, PLAYLIST_GO|PLAYLIST_APPEND, PLAYLIST_END, true, - false ); + pl_Unlocked ); vlc_gc_decref( p_item ); if( i_ret != VLC_SUCCESS ) { @@ -1460,7 +1460,7 @@ static int Playlist( vlc_object_t *p_this, char const *psz_cmd, msg_rc( "trying to enqueue %s to playlist", newval.psz_string ); if( playlist_AddInput( p_playlist, p_item, PLAYLIST_APPEND, PLAYLIST_END, true, - false ) != VLC_SUCCESS ) + pl_Unlocked ) != VLC_SUCCESS ) { return VLC_EGENERIC; } @@ -2144,7 +2144,7 @@ bool ReadCommand( intf_thread_t *p_intf, char *p_buffer, int *pi_size ) { /* Standard input closed: exit */ vlc_value_t empty; - Quit( p_intf, NULL, empty, empty, NULL ); + Quit( VLC_OBJECT(p_intf), NULL, empty, empty, NULL ); } p_buffer[ *pi_size ] = 0;