vlc | branch: master | Felix Paul Kühne <[email protected]> | Fri Jul 24 19:14:07 2015 +0200| [5f08edfe08baac9d4d8fc04b9ca24312449056ae] | committer: Felix Paul Kühne
libvlc: deprecate AGL vout setter/getter The QuickDraw vout is gone since a long time so this remnant is a NO-OP > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5f08edfe08baac9d4d8fc04b9ca24312449056ae --- NEWS | 3 ++- include/vlc/libvlc_media_player.h | 12 ++++-------- lib/media_player.c | 12 ------------ 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index 604bc53..6f9af08 100644 --- a/NEWS +++ b/NEWS @@ -145,7 +145,8 @@ libVLC: * Add libvlc_media_get_type to get the type of the media * Add libvlc_media_player_get_full_title_descriptions to get full title info of the media * Add libvlc_media_player_get_full_chapter_descriptions to get full chapter info of the media - * Deprecate libvlc_video_get_title_description, libvlc_video_get_chapter_description + * Deprecate libvlc_video_get_title_description, libvlc_video_get_chapter_description, + libvlc_media_player_get_agl, libvlc_media_player_set_agl Logging * Support for the SystemD Journal diff --git a/include/vlc/libvlc_media_player.h b/include/vlc/libvlc_media_player.h index b4f716e..0c7351b 100644 --- a/include/vlc/libvlc_media_player.h +++ b/include/vlc/libvlc_media_player.h @@ -451,19 +451,15 @@ LIBVLC_API void libvlc_media_player_set_nsobject ( libvlc_media_player_t *p_mi, LIBVLC_API void * libvlc_media_player_get_nsobject ( libvlc_media_player_t *p_mi ); /** - * Set the agl handler where the media player should render its video output. - * - * \param p_mi the Media Player - * \param drawable the agl handler + * \deprecated Use libvlc_media_player_set_nsobject instead */ +LIBVLC_DEPRECATED LIBVLC_API void libvlc_media_player_set_agl ( libvlc_media_player_t *p_mi, uint32_t drawable ); /** - * Get the agl handler previously set with libvlc_media_player_set_agl(). - * - * \param p_mi the Media Player - * \return the agl handler or 0 if none where set + * \deprecated Use libvlc_media_player_get_nsobject instead */ +LIBVLC_DEPRECATED LIBVLC_API uint32_t libvlc_media_player_get_agl ( libvlc_media_player_t *p_mi ); /** diff --git a/lib/media_player.c b/lib/media_player.c index 83af6cd..66c98db 100644 --- a/lib/media_player.c +++ b/lib/media_player.c @@ -1025,14 +1025,7 @@ void * libvlc_media_player_get_nsobject( libvlc_media_player_t *p_mi ) void libvlc_media_player_set_agl( libvlc_media_player_t *p_mi, uint32_t drawable ) { -#ifdef __APPLE__ - var_SetString (p_mi, "avcodec-hw", ""); - var_SetString (p_mi, "vout", ""); - var_SetString (p_mi, "window", "none"); - var_SetInteger (p_mi, "drawable-agl", drawable); -#else (void) p_mi; (void)drawable; -#endif } /************************************************************************** @@ -1040,12 +1033,7 @@ void libvlc_media_player_set_agl( libvlc_media_player_t *p_mi, **************************************************************************/ uint32_t libvlc_media_player_get_agl( libvlc_media_player_t *p_mi ) { - assert (p_mi != NULL); -#ifdef __APPLE__ - return var_GetInteger (p_mi, "drawable-agl"); -#else return 0; -#endif } /************************************************************************** _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
