From: Pierre d'Herbemont Date: Sat, 19 Jul 2008 09:27:45 +0000 (+0200) Subject: playlist: playlist_NodeAddInput was noted as deprecated in docs, remove it from expor... X-Git-Tag: 0.9.0-test3~372 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d057b0df8de8ec4816fa4d1fd194a89c7c49cce6;p=vlc playlist: playlist_NodeAddInput was noted as deprecated in docs, remove it from exported symbols. --- diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h index 2f837e4543..eb56950064 100644 --- a/include/vlc_playlist.h +++ b/include/vlc_playlist.h @@ -368,7 +368,6 @@ VLC_EXPORT( int, playlist_ItemSetName, (playlist_item_t *, const char * ) ); VLC_EXPORT( int, playlist_Add, ( playlist_t *, const char *, const char *, int, int, bool, bool ) ); VLC_EXPORT( int, playlist_AddExt, ( playlist_t *, const char *, const char *, int, int, mtime_t, const char *const *,int, bool, bool ) ); VLC_EXPORT( int, playlist_AddInput, ( playlist_t *, input_item_t *, int, int, bool, bool ) ); -VLC_EXPORT( playlist_item_t *, playlist_NodeAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int, bool ) ); VLC_EXPORT( int, playlist_BothAddInput, ( playlist_t *, input_item_t *,playlist_item_t *,int , int, int*, int*, bool ) ); /********************** Misc item operations **********************/ diff --git a/modules/gui/wxwidgets/dialogs/playlist.cpp b/modules/gui/wxwidgets/dialogs/playlist.cpp index 4faf317afd..c29a77f211 100644 --- a/modules/gui/wxwidgets/dialogs/playlist.cpp +++ b/modules/gui/wxwidgets/dialogs/playlist.cpp @@ -1287,8 +1287,8 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, char *psz_utf8 = wxDnDFromLocale( filenames[i] ); input_item_t *p_input = input_ItemNew( p->p_playlist, psz_utf8, psz_utf8 ); - int i_ret = ( playlist_NodeAddInput( p->p_playlist, p_input, p_dest, - PLAYLIST_PREPARSE, i_pos, false ) != VLC_SUCCESS ); + int i_ret = ( playlist_BothAddInput( p->p_playlist, p_input, p_dest, + PLAYLIST_PREPARSE, i_pos, NULL, NULL, pl_Unlocked ) != VLC_SUCCESS ); vlc_gc_decref( p_input ); wxDnDLocaleFree( psz_utf8 ); if( i_ret != VLC_SUCCESS ) diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 82f0a3b6b4..e3c6a4b130 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -259,7 +259,6 @@ playlist_ItemNewWithType playlist_ItemSetName playlist_ItemToNode playlist_LiveSearchUpdate -playlist_NodeAddInput playlist_NodeAppend playlist_NodeChildrenCount playlist_NodeCreate diff --git a/src/playlist/playlist_internal.h b/src/playlist/playlist_internal.h index 767b649596..431502eb6a 100644 --- a/src/playlist/playlist_internal.h +++ b/src/playlist/playlist_internal.h @@ -98,6 +98,9 @@ int playlist_MLDump( playlist_t *p_playlist ); void playlist_SendAddNotify( playlist_t *p_playlist, int i_item_id, int i_node_id, bool b_signal ); +playlist_item_t * playlist_NodeAddInput( playlist_t *, input_item_t *, + playlist_item_t *,int , int, bool ); + /* Tree walking */ playlist_item_t *playlist_ItemFindFromInputAndRoot( playlist_t *p_playlist, int i_input_id, playlist_item_t *p_root,