[vlc-commits] commit: XCB/window: force window provider when libvlc_*_set_xid() is used ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Jul  8 20:07:15 2010 +0300| [e2d1b524ca440868f8bf364ef402ff6fd348829e] | committer: Rémi Denis-Courmont 

XCB/window: force window provider when libvlc_*_set_xid() is used

We cannot drop the priority to zero. This would break rare but
functional use of `vlc --drawable-xid $WINDOWID`.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e2d1b524ca440868f8bf364ef402ff6fd348829e
---

 modules/video_output/xcb/window.c |    1 +
 src/control/media_player.c        |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index dc1c708..0f23762 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -74,6 +74,7 @@ vlc_module_begin ()
     set_subcategory (SUBCAT_VIDEO_VOUT)
     set_capability ("vout window xid", 70)
     set_callbacks (EmOpen, EmClose)
+    add_shortcut ("embed-xid")
 
     add_integer ("drawable-xid", 0, NULL, XID_TEXT, XID_LONGTEXT, true)
         change_volatile ()
diff --git a/src/control/media_player.c b/src/control/media_player.c
index 7b73bf8..d83782b 100644
--- a/src/control/media_player.c
+++ b/src/control/media_player.c
@@ -826,6 +826,7 @@ void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
                                       uint32_t drawable )
 {
     assert (p_mi != NULL);
+    var_SetString (p_mi, "window", "embed-xid,any");
     var_SetInteger (p_mi, "drawable-xid", drawable);
 }