vlc | branch: master | Thomas Guillem <[email protected]> | Mon Jun 15 13:48:44 2020 +0200| [a3cafc94cd435d8e317568d6ea1753b802e4e9eb] | committer: Thomas Guillem
lib: rename libvlc_media_track_delete to libvlc_media_track_release Since libvlc_media_track_t will be refcounted. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a3cafc94cd435d8e317568d6ea1753b802e4e9eb --- include/vlc/libvlc_media_player.h | 4 ++-- include/vlc/libvlc_media_track.h | 2 +- lib/libvlc.sym | 2 +- lib/media_track.c | 2 +- lib/video.c | 2 +- test/libvlc/media_player.c | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index c067e0acc9..bd9f220ca1 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -1325,7 +1325,7 @@ libvlc_media_player_get_tracklist( libvlc_media_player_t *p_mi, * \param type type of the selected track * * \return a valid track or NULL if there is no selected tracks for this type, - * release it with libvlc_media_track_delete(). + * release it with libvlc_media_track_release(). */ LIBVLC_API libvlc_media_track_t * libvlc_media_player_get_selected_track( libvlc_media_player_t *p_mi, @@ -1343,7 +1343,7 @@ libvlc_media_player_get_selected_track( libvlc_media_player_t *p_mi, * libvlc_media_track_t) * * \return a valid track or NULL if there is currently no tracks identified by - * the string id, release it with libvlc_media_track_delete(). + * the string id, release it with libvlc_media_track_release(). */ LIBVLC_API libvlc_media_track_t * libvlc_media_player_get_track_from_id( libvlc_media_player_t *p_mi, diff --git a/include/vlc/libvlc_media_track.h b/include/vlc/libvlc_media_track.h index e6a4d5d550..46bbbaf4bd 100644 --- a/include/vlc/libvlc_media_track.h +++ b/include/vlc/libvlc_media_track.h @@ -217,7 +217,7 @@ libvlc_media_tracklist_delete( libvlc_media_tracklist_t *list ); * \param track valid track */ LIBVLC_API void -libvlc_media_track_delete( libvlc_media_track_t *track ); +libvlc_media_track_release( libvlc_media_track_t *track ); /** @}*/ # ifdef __cplusplus diff --git a/lib/libvlc.sym b/lib/libvlc.sym index d997d79939..739f7d444e 100644 --- a/lib/libvlc.sym +++ b/lib/libvlc.sym @@ -86,7 +86,7 @@ libvlc_media_thumbnail_request_by_time libvlc_media_thumbnail_request_by_pos libvlc_media_thumbnail_request_cancel libvlc_media_thumbnail_request_destroy -libvlc_media_track_delete +libvlc_media_track_release libvlc_media_tracklist_at libvlc_media_tracklist_count libvlc_media_tracklist_delete diff --git a/lib/media_track.c b/lib/media_track.c index d9cb7932a7..84b4b16ef0 100644 --- a/lib/media_track.c +++ b/lib/media_track.c @@ -133,7 +133,7 @@ libvlc_media_track_clean( libvlc_media_track_t *track ) } void -libvlc_media_track_delete( libvlc_media_track_t *track ) +libvlc_media_track_release( libvlc_media_track_t *track ) { libvlc_media_trackpriv_t *trackpriv = container_of( track, libvlc_media_trackpriv_t, t ); diff --git a/lib/video.c b/lib/video.c index 2786108b88..07e26c038b 100644 --- a/lib/video.c +++ b/lib/video.c @@ -173,7 +173,7 @@ int libvlc_video_get_size( libvlc_media_player_t *p_mi, unsigned ignored, ret = 0; } - libvlc_media_track_delete(track); + libvlc_media_track_release(track); return ret; } diff --git a/test/libvlc/media_player.c b/test/libvlc/media_player.c index b63e161409..088f9153d2 100644 --- a/test/libvlc/media_player.c +++ b/test/libvlc/media_player.c @@ -443,7 +443,7 @@ static void test_media_player_tracks(const char** argv, int argc) libtrack = libvlc_media_player_get_track_from_id(mp, "audio/0"); assert(libtrack); libvlc_media_player_select_track(mp, libvlc_track_audio, libtrack); - libvlc_media_track_delete(libtrack); + libvlc_media_track_release(libtrack); atracks[0].toselect = true; atracks[2].toselect = false; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
