vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Thu Oct 24 11:25:58 2019 +0200| [b3e904abac8c45b6b515fdd48090b1014c04245b] | committer: Hugo Beauzée-Luyssen
lib: media: Rename thumbnail request detroy & cancel functions To reflect that they act on a thumbnail request, not a thumbnail itself > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b3e904abac8c45b6b515fdd48090b1014c04245b --- include/vlc/libvlc_media.h | 12 ++++++------ lib/libvlc.sym | 4 ++-- lib/media.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/vlc/libvlc_media.h b/include/vlc/libvlc_media.h index e64ecdb84c..d60617a3a5 100644 --- a/include/vlc/libvlc_media.h +++ b/include/vlc/libvlc_media.h @@ -830,8 +830,8 @@ typedef enum libvlc_thumbnailer_seek_speed_t * \param timeout A timeout value in ms, or 0 to disable timeout * * \return A valid opaque request object, or NULL in case of failure. - * It may be cancelled by libvlc_media_thumbnail_cancel(). - * It must be released by libvlc_media_thumbnail_destroy(). + * It may be cancelled by libvlc_media_thumbnail_request_cancel(). + * It must be released by libvlc_media_thumbnail_request_destroy(). * * \version libvlc 4.0 or later * @@ -861,8 +861,8 @@ libvlc_media_thumbnail_request_by_time( libvlc_media_t *md, * \param timeout A timeout value in ms, or 0 to disable timeout * * \return A valid opaque request object, or NULL in case of failure. - * It may be cancelled by libvlc_media_thumbnail_cancel(). - * It must be released by libvlc_media_thumbnail_destroy(). + * It may be cancelled by libvlc_media_thumbnail_request_cancel(). + * It must be released by libvlc_media_thumbnail_request_destroy(). * * \version libvlc 4.0 or later * @@ -886,7 +886,7 @@ libvlc_media_thumbnail_request_by_pos( libvlc_media_t *md, * If the request is cancelled after its completion, the behavior is undefined. */ LIBVLC_API void -libvlc_media_thumbnail_cancel( libvlc_media_thumbnail_request_t *p_req ); +libvlc_media_thumbnail_request_cancel( libvlc_media_thumbnail_request_t *p_req ); /** * @brief libvlc_media_thumbnail_destroy destroys a thumbnail request @@ -896,7 +896,7 @@ libvlc_media_thumbnail_cancel( libvlc_media_thumbnail_request_t *p_req ); * is undefined */ LIBVLC_API void -libvlc_media_thumbnail_destroy( libvlc_media_thumbnail_request_t *p_req ); +libvlc_media_thumbnail_request_destroy( libvlc_media_thumbnail_request_t *p_req ); /** * Add a slave to the current media. diff --git a/lib/libvlc.sym b/lib/libvlc.sym index 3a4870120d..d8fb0806bc 100644 --- a/lib/libvlc.sym +++ b/lib/libvlc.sym @@ -83,8 +83,8 @@ libvlc_media_is_parsed libvlc_media_get_parsed_status libvlc_media_thumbnail_request_by_time libvlc_media_thumbnail_request_by_pos -libvlc_media_thumbnail_cancel -libvlc_media_thumbnail_destroy +libvlc_media_thumbnail_request_cancel +libvlc_media_thumbnail_request_destroy libvlc_media_list_add_media libvlc_media_list_count libvlc_media_list_event_manager diff --git a/lib/media.c b/lib/media.c index 27df35b454..36dee3b9e5 100644 --- a/lib/media.c +++ b/lib/media.c @@ -1181,14 +1181,14 @@ libvlc_media_thumbnail_request_by_pos( libvlc_media_t *md, float pos, return req; } -void libvlc_media_thumbnail_cancel( libvlc_media_thumbnail_request_t *req ) +void libvlc_media_thumbnail_request_cancel( libvlc_media_thumbnail_request_t *req ) { libvlc_priv_t *p_priv = libvlc_priv(req->md->p_libvlc_instance->p_libvlc_int); assert( p_priv->p_thumbnailer != NULL ); vlc_thumbnailer_Cancel( p_priv->p_thumbnailer, req->req ); } -void libvlc_media_thumbnail_destroy( libvlc_media_thumbnail_request_t *req ) +void libvlc_media_thumbnail_request_destroy( libvlc_media_thumbnail_request_t *req ) { libvlc_media_release( req->md ); free( req ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
