Remove set/get drawable

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index cbb382dce44eeb755b630202900b9989acf6a844..e946b77f6b8818cfc89a9256d1fbd450c26a60fc 100644 (file)
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -41,36 +41,6 @@ typedef int libvlc_drawable_t;
 extern "C" {
 # endif
 
-/**
- * Set the drawable where the media player should render its video output.
- *
- * On Windows 32-bits, a window handle (HWND) is expected.
- * On Windows 64-bits, this function will always fail.
- *
- * On OSX 32-bits, a CGrafPort is expected.
- * On OSX 64-bits, this function will always fail.
- *
- * On other platforms, an existing X11 window ID is expected. See
- * libvlc_media_player_set_xwindow() for details.
- *
- * \param p_mi the Media Player
- * \param drawable the libvlc_drawable_t where the media player
- *        should render its video
- * \param p_e an initialized exception pointer
- */
-VLC_DEPRECATED_API void libvlc_media_player_set_drawable ( libvlc_media_player_t *, libvlc_drawable_t, libvlc_exception_t * );
-
-/**
- * Get the drawable where the media player should render its video output
- *
- * \param p_mi the Media Player
- * \param p_e an initialized exception pointer
- * \return the libvlc_drawable_t where the media player
- *         should render its video
- */
-VLC_DEPRECATED_API libvlc_drawable_t
-                    libvlc_media_player_get_drawable ( libvlc_media_player_t *, libvlc_exception_t * );
-
 /*****************************************************************************
  * Playlist (Deprecated)
  *****************************************************************************/

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 5c5674c37d0d19213084e01e1b512aa3aa04f5a0..bfc177c3a2f7e37d99046381581d561da25fc32f 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -743,48 +743,6 @@ void *libvlc_media_player_get_hwnd( libvlc_media_player_t *p_mi )
     return p_mi->drawable.hwnd;
 }
 
-/**************************************************************************
- * Set Drawable
- **************************************************************************/
-void libvlc_media_player_set_drawable( libvlc_media_player_t *p_mi,
-                                       libvlc_drawable_t drawable,
-                                       libvlc_exception_t *p_e )
-{
-#ifdef WIN32
-    if (sizeof (HWND) <= sizeof (libvlc_drawable_t))
-        p_mi->drawable.hwnd = (HWND)drawable;
-    else
-        libvlc_exception_raise(p_e, "Operation not supported");
-#elif defined(__APPLE__)
-    p_mi->drawable.agl = drawable;
-    (void) p_e;
-#else
-    p_mi->drawable.xid = drawable;
-    (void) p_e;
-#endif
-}
-
-/**************************************************************************
- * Get Drawable
- **************************************************************************/
-libvlc_drawable_t
-libvlc_media_player_get_drawable ( libvlc_media_player_t *p_mi,
-                                   libvlc_exception_t *p_e )
-{
-    VLC_UNUSED(p_e);
-
-#ifdef WIN32
-    if (sizeof (HWND) <= sizeof (libvlc_drawable_t))
-        return (libvlc_drawable_t)p_mi->drawable.hwnd;
-    else
-        return 0;
-#elif defined(__APPLE__)
-    return p_mi->drawable.agl;
-#else
-    return p_mi->drawable.xid;
-#endif
-}
-
 /**************************************************************************
  * Getters for stream information
  **************************************************************************/

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index 330e90c6bfba3063ad9f8818becfe01b5be89eef..9afb08cf9f0105b96d1e833f23660ededb85a0c4 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -241,8 +241,11 @@ int mediacontrol_set_visual( mediacontrol_Instance *self,
 
     mediacontrol_exception_init( exception );
     libvlc_exception_init( &ex );
-
-    libvlc_media_player_set_drawable( self->p_media_player, (libvlc_drawable_t)visual_id, &ex );
+#ifdef WIN32
+    libvlc_media_player_set_hwnd( self->p_media_player, visual_id, &ex );
+#else
+    libvlc_media_player_set_xwindow( self->p_media_player, visual_id, &ex );
+#endif
     HANDLE_LIBVLC_EXCEPTION_ZERO( &ex );
     return true;
 }

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 09107d42a5c85c13fe284abf680d41fc1496139f..d59a02ba7a1583610574e534ca7d2829692f9cf5 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -130,7 +130,6 @@ libvlc_media_player_get_agl
 libvlc_media_player_get_chapter
 libvlc_media_player_get_chapter_count
 libvlc_media_player_get_chapter_count_for_title
-libvlc_media_player_get_drawable
 libvlc_media_player_get_fps
 libvlc_media_player_get_hwnd
 libvlc_media_player_get_length
@@ -156,7 +155,6 @@ libvlc_media_player_release
 libvlc_media_player_retain
 libvlc_media_player_set_agl
 libvlc_media_player_set_chapter
-libvlc_media_player_set_drawable
 libvlc_media_player_set_hwnd
 libvlc_media_player_set_media
 libvlc_media_player_set_nsobject