X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fcdda.c;h=ba3fdcddba61dc76f8a9ccd2a114f4e786569cb8;hb=31d526a9f743e9f122b2a0e14fef5b318adc1dba;hp=449d6b61eb4845e79de04d798865f9c5f662e231;hpb=23613e67cacdbcaefd3cf019a25bac7e3c34c02c;p=vlc diff --git a/modules/access/cdda.c b/modules/access/cdda.c index 449d6b61eb..ba3fdcddba 100644 --- a/modules/access/cdda.c +++ b/modules/access/cdda.c @@ -201,7 +201,7 @@ static int Open( vlc_object_t *p_this ) if( p_playlist->status.p_item->p_input == p_current ) p_item = p_playlist->status.p_item; else - p_item = playlist_ItemGetByInput( p_playlist, p_current, false ); + p_item = playlist_ItemGetByInput( p_playlist, p_current, pl_Unlocked ); if( p_item ) i_ret = GetTracks( p_access, p_playlist, p_item ); @@ -209,7 +209,7 @@ static int Open( vlc_object_t *p_this ) msg_Dbg( p_playlist, "unable to find item in playlist"); vlc_object_release( p_input ); } - vlc_object_release( p_playlist ); + pl_Release( p_access ); } if( i_ret < 0 ) goto error; @@ -420,7 +420,7 @@ static int GetTracks( access_t *p_access, return VLC_EGENERIC; } - p_item_in_category = playlist_ItemToNode( p_playlist, p_parent, false ); + p_item_in_category = playlist_ItemToNode( p_playlist, p_parent, pl_Unlocked ); playlist_ItemSetName( p_parent, "Audio CD" ); var_SetInteger( p_playlist, "item-change", p_parent->p_input->i_id ); @@ -495,7 +495,7 @@ static int GetTracks( access_t *p_access, int i_ret = playlist_BothAddInput( p_playlist, p_input_item, p_item_in_category, PLAYLIST_APPEND, PLAYLIST_END, NULL, NULL, - false ); + pl_Unlocked ); vlc_gc_decref( p_input_item ); free( psz_uri ); free( psz_opt ); free( psz_name ); free( psz_first ); free( psz_last );