Commit ec8b0a2d authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

libvlc: libvlc_video_set_parent and libvlc_video_get_parent are deprecated.

parent 7041e62b
...@@ -29,6 +29,30 @@ ...@@ -29,6 +29,30 @@
extern "C" { extern "C" {
# endif # endif
/**
* Set the default video output's parent.
*
* This setting will be used as default for all video outputs.
*
* \param p_instance libvlc instance
* \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
* \param p_e an initialized exception pointer
* @deprecated Use libvlc_media_player_set_drawable
*/
VLC_PUBLIC_API void libvlc_video_set_parent( libvlc_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
/**
* Set the default video output parent.
*
* This setting will be used as default for all video outputs.
*
* \param p_instance libvlc instance
* \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
* \param p_e an initialized exception pointer
* @deprecated Use libvlc_media_player_get_drawable
*/
VLC_PUBLIC_API libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *, libvlc_exception_t * );
/* /*
* This function shall not be used at all. It may lead to crash and race condition. * This function shall not be used at all. It may lead to crash and race condition.
*/ */
......
...@@ -649,28 +649,6 @@ VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawab ...@@ -649,28 +649,6 @@ VLC_PUBLIC_API int libvlc_video_reparent( libvlc_media_player_t *, libvlc_drawab
*/ */
VLC_PUBLIC_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * ); VLC_PUBLIC_API void libvlc_video_redraw_rectangle( libvlc_media_player_t *, const libvlc_rectangle_t *, libvlc_exception_t * );
/**
* Set the default video output's parent.
*
* This setting will be used as default for all video outputs.
*
* \param p_instance libvlc instance
* \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API void libvlc_video_set_parent( libvlc_instance_t *, libvlc_drawable_t, libvlc_exception_t * );
/**
* Set the default video output parent.
*
* This setting will be used as default for all video outputs.
*
* \param p_instance libvlc instance
* \param drawable the new parent window (Drawable on X11, CGrafPort on MacOSX, HWND on Win32)
* \param p_e an initialized exception pointer
*/
VLC_PUBLIC_API libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *, libvlc_exception_t * );
/** /**
* Set the default video output size. * Set the default video output size.
* *
......
...@@ -231,6 +231,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi, ...@@ -231,6 +231,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
/* global video settings */ /* global video settings */
/* Deprecated use libvlc_media_player_set_drawable() */
void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d, void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
libvlc_exception_t *p_e ) libvlc_exception_t *p_e )
{ {
...@@ -245,6 +246,7 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d ...@@ -245,6 +246,7 @@ void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d
} }
} }
/* Deprecated use libvlc_media_player_get_drawable() */
libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) libvlc_drawable_t libvlc_video_get_parent( libvlc_instance_t *p_instance, libvlc_exception_t *p_e )
{ {
VLC_UNUSED(p_e); VLC_UNUSED(p_e);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment