[vlc-devel] commit: Room for window provider to pass the X11 display ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec  7 23:59:16 2009 +0200| [9387010346e1d0c9bd554bc9e469e99331c99da2] | committer: Rémi Denis-Courmont 

Room for window provider to pass the X11 display

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

 include/vlc_vout_window.h |    5 +++++
 src/video_output/window.c |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 2c05e4c..f2e14fe 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -92,6 +92,11 @@ struct vout_window_t {
         uint32_t xid;     /* X11 windows ID */
     };
 
+    /* display server (mandatory) */
+    union {
+        char     *x11_display; /* X11 display (NULL = use default) */
+    };
+
     /* Control on the module (mandatory)
      *
      * Do not use it directly; use vout_window_Control instead.
diff --git a/src/video_output/window.c b/src/video_output/window.c
index e12e75b..2b66181 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -66,6 +66,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     case VOUT_WINDOW_TYPE_XID:
         type = "vout window xid";
         window->xid = 0;
+        window->x11_display = NULL;
         break;
     default:
         assert(0);