From 9fa2642c44cc79793530eda5ab44c03c6ab47d46 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= Date: Sun, 19 Nov 2006 16:09:16 +0000 Subject: [PATCH] Fixes wxwidgets compilation --- modules/gui/wxwidgets/dialogs/playlist.cpp | 2 +- modules/gui/wxwidgets/dialogs/wizard.cpp | 3 +-- modules/gui/wxwidgets/playlist_manager.cpp | 9 +++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/gui/wxwidgets/dialogs/playlist.cpp b/modules/gui/wxwidgets/dialogs/playlist.cpp index ebcd71cfbd..6ce94cf7c5 100644 --- a/modules/gui/wxwidgets/dialogs/playlist.cpp +++ b/modules/gui/wxwidgets/dialogs/playlist.cpp @@ -907,7 +907,7 @@ void Playlist::DeleteTreeItem( wxTreeItemId item ) 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 ) diff --git a/modules/gui/wxwidgets/dialogs/wizard.cpp b/modules/gui/wxwidgets/dialogs/wizard.cpp index a59a0a7fcd..c2d04465ad 100644 --- a/modules/gui/wxwidgets/dialogs/wizard.cpp +++ b/modules/gui/wxwidgets/dialogs/wizard.cpp @@ -721,8 +721,7 @@ void wizInputPage::OnWizardPageChanging(wxWizardEvent& event) VLC_OBJECT_PLAYLIST, FIND_ANYWHERE); if( p_playlist ) { - playlist_item_t * p_item = playlist_LockItemGetById( - p_playlist, (int)data ); + playlist_item_t * p_item = playlist_ItemGetById( p_playlist, (int)data, VLC_TRUE ); if( p_item ) { p_parent->SetMrl( (const char*)p_item->p_input->psz_uri ); diff --git a/modules/gui/wxwidgets/playlist_manager.cpp b/modules/gui/wxwidgets/playlist_manager.cpp index b6ddce5729..334a5ae2fd 100644 --- a/modules/gui/wxwidgets/playlist_manager.cpp +++ b/modules/gui/wxwidgets/playlist_manager.cpp @@ -281,7 +281,8 @@ void PlaylistManager::UpdateTreeItem( wxTreeItemId item ) LockPlaylist( p_intf->p_sys, p_playlist ); 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 ) { UnlockPlaylist( p_intf->p_sys, p_playlist ); @@ -354,7 +355,7 @@ void PlaylistManager::AppendItem( wxCommandEvent& event ) node = FindItem( treectrl->GetRootItem(), p_add->i_node ); 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; item = FindItem( treectrl->GetRootItem(), p_add->i_item ); @@ -495,8 +496,8 @@ void PlaylistManager::OnActivateItem( wxTreeEvent& event ) if( !p_wxparent ) return; LockPlaylist( p_intf->p_sys, p_playlist ); - p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id ); - p_node = playlist_ItemGetById( p_playlist, p_wxparent->i_id ); + p_item = playlist_ItemGetById( p_playlist, p_wxitem->i_id, VLC_TRUE ); + p_node = playlist_ItemGetById( p_playlist, p_wxparent->i_id, VLC_TRUE ); if( !p_item || p_item->i_children >= 0 ) { p_node = p_item; -- 2.39.2