Commit 9fa2642c authored by Rafaël Carré's avatar Rafaël Carré

Fixes wxwidgets compilation

parent d732fd2f
...@@ -907,7 +907,7 @@ void Playlist::DeleteTreeItem( wxTreeItemId item ) ...@@ -907,7 +907,7 @@ void Playlist::DeleteTreeItem( wxTreeItemId item )
void Playlist::DeleteItem( int item_id ) void Playlist::DeleteItem( int item_id )
{ {
playlist_DeleteAllFromInput( p_playlist, item_id ); playlist_DeleteFromInput( p_playlist, item_id, VLC_TRUE );
} }
void Playlist::DeleteNode( playlist_item_t *p_item ) void Playlist::DeleteNode( playlist_item_t *p_item )
......
...@@ -721,8 +721,7 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event) ...@@ -721,8 +721,7 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event)
VLC_OBJECT_PLAYLIST, FIND_ANYWHERE); VLC_OBJECT_PLAYLIST, FIND_ANYWHERE);
if( p_playlist ) if( p_playlist )
{ {
playlist_item_t * p_item = playlist_LockItemGetById( playlist_item_t * p_item = playlist_ItemGetById( p_playlist, (int)data, VLC_TRUE );
p_playlist, (int)data );
if( p_item ) if( p_item )
{ {
p_parent->SetMrl( (const char*)p_item->p_input->psz_uri ); p_parent->SetMrl( (const char*)p_item->p_input->psz_uri );
......
...@@ -281,7 +281,8 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item ) ...@@ -281,7 +281,8 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item )
LockPlaylist( p_intf->p_sys, p_playlist ); LockPlaylist( p_intf->p_sys, p_playlist );
playlist_item_t *p_item = playlist_item_t *p_item =
playlist_ItemGetById( p_playlist, ((PlaylistItem *)p_data)->i_id ); playlist_ItemGetById( p_playlist, ((PlaylistItem *)p_data)->i_id,
VLC_TRUE );
if( !p_item ) if( !p_item )
{ {
UnlockPlaylist( p_intf->p_sys, p_playlist ); UnlockPlaylist( p_intf->p_sys, p_playlist );
...@@ -354,7 +355,7 @@ void PlaylistManager::AppendItem( wxCommandEvent& event ) ...@@ -354,7 +355,7 @@ void PlaylistManager::AppendItem( wxCommandEvent& event )
node = FindItem( treectrl->GetRootItem(), p_add->i_node ); node = FindItem( treectrl->GetRootItem(), p_add->i_node );
if( !node.IsOk() ) goto update; if( !node.IsOk() ) goto update;
p_item = playlist_ItemGetById( p_playlist, p_add->i_item ); p_item = playlist_ItemGetById( p_playlist, p_add->i_item, VLC_TRUE );
if( !p_item ) goto update; if( !p_item ) goto update;
item = FindItem( treectrl->GetRootItem(), p_add->i_item ); item = FindItem( treectrl->GetRootItem(), p_add->i_item );
...@@ -495,8 +496,8 @@ void PlaylistManager::OnActivateItem( wxTreeEvent& event ) ...@@ -495,8 +496,8 @@ void PlaylistManager::OnActivateItem( wxTreeEvent& event )
if( !p_wxparent ) return; if( !p_wxparent ) return;
LockPlaylist( p_intf->p_sys, p_playlist ); LockPlaylist( p_intf->p_sys, p_playlist );
p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id ); p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id, VLC_TRUE );
p_node = playlist_ItemGetById( p_playlist, p_wxparent->i_id ); p_node = playlist_ItemGetById( p_playlist, p_wxparent->i_id, VLC_TRUE );
if( !p_item || p_item->i_children >= 0 ) if( !p_item || p_item->i_children >= 0 )
{ {
p_node = p_item; p_node = p_item;
......
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