XCB: use var_Inherit*()

[vlc] / modules / video_output / xcb / common.c

diff --git a/modules/video_output/xcb/common.c b/modules/video_output/xcb/common.c
index 4ebc26da555c21048dd5435c79f020b98db9eaaa..2b7588f319823000e67de25369f357ef35b912ed 100644 (file)
--- a/modules/video_output/xcb/common.c
+++ b/modules/video_output/xcb/common.c
@@ -125,6 +125,8 @@ vout_window_t *GetWindow (vout_display_t *vd,
 
     memset( &wnd_cfg, 0, sizeof(wnd_cfg) );
     wnd_cfg.type = VOUT_WINDOW_TYPE_XID;
+    wnd_cfg.x = var_InheritInteger (vd, "video-x");
+    wnd_cfg.y = var_InheritInteger (vd, "video-y");
     wnd_cfg.width  = vd->cfg->display.width;
     wnd_cfg.height = vd->cfg->display.height;
 
@@ -135,7 +137,7 @@ vout_window_t *GetWindow (vout_display_t *vd,
         return NULL;
     }
 
-    xcb_connection_t *conn = Connect (VLC_OBJECT(vd), wnd->x11_display);
+    xcb_connection_t *conn = Connect (VLC_OBJECT(vd), wnd->display.x11);
     if (conn == NULL)
         goto error;
     *pconn = conn;
@@ -158,7 +160,7 @@ error:
 /** Check MIT-SHM shared memory support */
 void CheckSHM (vlc_object_t *obj, xcb_connection_t *conn, bool *restrict pshm)
 {
-    bool shm = var_CreateGetBool (obj, "x11-shm") > 0;
+    bool shm = var_InheritBool (obj, "x11-shm") > 0;
     if (shm)
     {
         xcb_shm_query_version_cookie_t ck;