Commit 345c6daa authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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.
parent c7eb703d
...@@ -555,19 +555,18 @@ VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_e ...@@ -555,19 +555,18 @@ VLC_PUBLIC_API void libvlc_media_player_stop ( libvlc_media_player_t *, libvlc_e
* no effects. * no effects.
* *
* The specified identifier must correspond to an existing Input/Output class * 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 * X11 window. Pixmaps are <b>not</b> supported. The caller shall ensure that
* one the VLC instance has been configured with. * the X11 server is the same as the one the VLC instance has been configured
* If XVideo is <b>not</b> supported or usable, it is assumed that the drawable * with.
* has the following properties in common with the default X11 screen: * If XVideo is <b>not</b> used, it is assumed that the drawable has the
* depth, scan line pad, black pixel. This is a bug. * following properties in common with the default X11 screen: depth, scan line
* Using a pixmap rather than a window might not work as VLC might try to * pad, black pixel. This is a bug.
* get window properties and subscribe to window events.
* *
* \param p_mi the Media Player * \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 * \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 * Set a Win32/Win64 API window handle (HWND) where the media player should
......
...@@ -698,7 +698,7 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi, ...@@ -698,7 +698,7 @@ void libvlc_media_player_stop( libvlc_media_player_t *p_mi,
} }
} }
void libvlc_media_player_set_xid( libvlc_media_player_t *p_mi, void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
uint32_t drawable, uint32_t drawable,
libvlc_exception_t *p_e ) libvlc_exception_t *p_e )
{ {
......
...@@ -153,7 +153,7 @@ libvlc_media_player_set_position ...@@ -153,7 +153,7 @@ libvlc_media_player_set_position
libvlc_media_player_set_rate libvlc_media_player_set_rate
libvlc_media_player_set_time libvlc_media_player_set_time
libvlc_media_player_set_title libvlc_media_player_set_title
libvlc_media_player_set_xid libvlc_media_player_set_xwindow
libvlc_media_player_stop libvlc_media_player_stop
libvlc_media_player_will_play libvlc_media_player_will_play
libvlc_media_release libvlc_media_release
......
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