From 2d4241a1f7ac7a1ce47e2646c93421a64c49d7ab Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Wed, 13 May 2009 21:48:24 +0300 Subject: [PATCH] Deprecate all broken vout_Control() abusers --- include/vlc/deprecated.h | 50 ++++++++++++++++++++++++++++++++++++---- include/vlc/libvlc.h | 46 ------------------------------------ 2 files changed, 46 insertions(+), 50 deletions(-) diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h index 886dfdbded..2cb82e1103 100644 --- a/include/vlc/deprecated.h +++ b/include/vlc/deprecated.h @@ -97,14 +97,56 @@ VLC_DEPRECATED_API void libvlc_video_set_parent( libvlc_instance_t *, libvlc_dra VLC_DEPRECATED_API libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *, libvlc_exception_t * ); /** - * Change the parent for the current the video output. + * Does nothing. Do not use this function. + */ +VLC_DEPRECATED_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * ); + +/** + * Resize the current video output window. + * This might crash. Please use libvlc_video_set_scale() instead. * - * \param p_instance libvlc instance - * \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32) + * \param p_mi media player instance + * \param width new width for video output window + * \param height new height for video output window * \param p_e an initialized exception pointer * \return the success status (boolean) */ -VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * ); +VLC_DEPRECATED_API void libvlc_video_resize( libvlc_media_player_t *, int, int, libvlc_exception_t *); + +/** + * Tell windowless video output to redraw rectangular area (MacOS X only). + * This might crash. Do not use this function. + * + * \param p_mi media player instance + * \param area coordinates within video drawable + * \param p_e an initialized exception pointer + */ +VLC_DEPRECATED_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * ); + +/** + * Set the default video output size. + * This setting will be used as default for all video outputs. + * + * \param p_instance libvlc instance + * \param width new width for video drawable + * \param height new height for video drawable + * \param p_e an initialized exception pointer + */ +VLC_DEPRECATED_API void libvlc_video_set_size( libvlc_instance_t *, int, int, libvlc_exception_t * ); + +/** + * Set the default video output viewport for a windowless video output + * (MacOS X only). This might crash. Do not use this function. + * + * This setting will be used as default for all video outputs. + * + * \param p_instance libvlc instance + * \param p_mi media player instance + * \param view coordinates within video drawable + * \param clip coordinates within video drawable + * \param p_e an initialized exception pointer + */ +VLC_DEPRECATED_API void libvlc_video_set_viewport( libvlc_instance_t *, libvlc_media_player_t *, const libvlc_rectangle_t *, const libvlc_rectangle_t *, libvlc_exception_t * ); /* * This function shall not be used at all. It may lead to crash and race condition. diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h index 0e14b5f575..c4038a6ee9 100644 --- a/include/vlc/libvlc.h +++ b/include/vlc/libvlc.h @@ -1092,52 +1092,6 @@ VLC_PUBLIC_API void libvlc_video_set_track( libvlc_media_player_t *, int, libvlc */ VLC_PUBLIC_API void libvlc_video_take_snapshot( libvlc_media_player_t *, const char *,unsigned int, unsigned int, libvlc_exception_t * ); -/** - * Resize the current video output window. - * - * \param p_mi media player instance - * \param width new width for video output window - * \param height new height for video output window - * \param p_e an initialized exception pointer - * \return the success status (boolean) - */ -VLC_PUBLIC_API void libvlc_video_resize( libvlc_media_player_t *, int, int, libvlc_exception_t *); - -/** - * Tell windowless video output to redraw rectangular area (MacOS X only). - * - * \param p_mi media player instance - * \param area coordinates within video drawable - * \param p_e an initialized exception pointer - */ -VLC_PUBLIC_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * ); - -/** - * Set the default video output size. - * - * This setting will be used as default for all video outputs. - * - * \param p_instance libvlc instance - * \param width new width for video drawable - * \param height new height for video drawable - * \param p_e an initialized exception pointer - */ -VLC_PUBLIC_API void libvlc_video_set_size( libvlc_instance_t *, int, int, libvlc_exception_t * ); - -/** - * Set the default video output viewport for a windowless video output - * (MacOS X only). - * - * This setting will be used as default for all video outputs. - * - * \param p_instance libvlc instance - * \param p_mi media player instance - * \param view coordinates within video drawable - * \param clip coordinates within video drawable - * \param p_e an initialized exception pointer - */ -VLC_PUBLIC_API void libvlc_video_set_viewport( libvlc_instance_t *, libvlc_media_player_t *, const libvlc_rectangle_t *, const libvlc_rectangle_t *, libvlc_exception_t * ); - /** @} video */ /** \defgroup libvlc_audio libvlc_audio -- 2.39.2