libvlc: libvlc_video_set_parent and libvlc_video_get_parent are deprecated.

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index d88439e73c0df1597c4569194008bb7226b8f78b..92737b0c82957a7352dd426bd7ae85d004094cea 100644 (file)
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -29,6 +29,30 @@
 extern "C" {
 # 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.
  */

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index bb155dc1cc1cd29d443770d7cdbb40ea80c964f6..7c82df8e9e26e8486a44e34d42e01706da786907 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -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 * );
 
-/**
- * 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.
  *

diff --git a/src/control/video.c b/src/control/video.c
index 867d0b114b18d13c8f48e975f6a47fc085e84ac5..a4beca631461ffd6bd4377441d7b5095ea88289d 100644 (file)
--- a/src/control/video.c
+++ b/src/control/video.c
@@ -231,6 +231,7 @@ void libvlc_video_redraw_rectangle( libvlc_media_player_t *p_mi,
 
 /* global video settings */
 
+/* Deprecated use libvlc_media_player_set_drawable() */
 void libvlc_video_set_parent( libvlc_instance_t *p_instance, libvlc_drawable_t d,
                               libvlc_exception_t *p_e )
 {
@@ -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 )
 {
     VLC_UNUSED(p_e);