X11 pixmaps will not work as drawable

Our outputs want to create a window as a child of the drawable. This is
never going to work with a pixmap.

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index f6fc51942a9ab7fab4280aa608df61ce6cd73f45..57c88b24a047357585a0928a6cec51643fc48e88 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -555,19 +555,18 @@ VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_e
  * no effects.
  *
  * The specified identifier must correspond to an existing Input/Output class
- * X11 drawable. The caller shall ensure that the X11 server is the same as the
- * one the VLC instance has been configured with.
- * If XVideo is <b>not</b> supported or usable, it is assumed that the drawable
- * has the following properties in common with the default X11 screen:
- * depth, scan line pad, black pixel. This is a bug.
- * Using a pixmap rather than a window might not work as VLC might try to
- * get window properties and subscribe to window events.
+ * X11 window. Pixmaps are <b>not</b> supported. The caller shall ensure that
+ * the X11 server is the same as the one the VLC instance has been configured
+ * with.
+ * If XVideo is <b>not</b> used, it is assumed that the drawable has the
+ * following properties in common with the default X11 screen: depth, scan line
+ * pad, black pixel. This is a bug.
  *
  * \param p_mi the Media Player
- * \param drawable the ID of the X drawable
+ * \param drawable the ID of the X window
  * \param p_e an initialized exception pointer
  */
-VLC_PUBLIC_API void libvlc_media_player_set_xid ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
+VLC_PUBLIC_API void libvlc_media_player_set_xwindow ( libvlc_media_player_t *p_mi, uint32_t drawable, libvlc_exception_t *p_e );
 
 /**
  * Set a Win32/Win64 API window handle (HWND) where the media player should

diff --git a/src/control/media_player.c b/src/control/media_player.c
index 31589b3172710542fc8e1d67d5d75d2d92d53973..ec74c9bc4037925b54494f28f03ed91788115be0 100644 (file)
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -698,9 +698,9 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
     }
 }
 
-void libvlc_media_player_set_xid( libvlc_media_player_t *p_mi,
-                                  uint32_t drawable,
-                                  libvlc_exception_t *p_e )
+void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
+                                      uint32_t drawable,
+                                      libvlc_exception_t *p_e )
 {
     (void) p_e;
     p_mi->drawable.xid = drawable;

diff --git a/src/libvlc.sym b/src/libvlc.sym
index 3c46ec19552cafdd0de00ac5149eb1f762db51ac..45587b8b4c45fbaee1ed0311a283d670d5c78e8a 100644 (file)
--- a/src/libvlc.sym
+++ b/src/libvlc.sym
@@ -153,7 +153,7 @@ libvlc_media_player_set_position
 libvlc_media_player_set_rate
 libvlc_media_player_set_time
 libvlc_media_player_set_title
-libvlc_media_player_set_xid
+libvlc_media_player_set_xwindow
 libvlc_media_player_stop
 libvlc_media_player_will_play
 libvlc_media_release