Name another anonynous union

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 53e3665c004dbf3ddd90bc5b93530663e42d841c..84d78eebcf3841ccc5f0b8913d34a303d36ca256 100644 (file)
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -94,8 +94,8 @@ struct vout_window_t {
 
     /* display server (mandatory) */
     union {
-        char     *x11_display; /* X11 display (NULL = use default) */
-    };
+        char     *x11; /* X11 display (NULL = use default) */
+    } display;
 
     /* Control on the module (mandatory)
      *

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 904c363d6d39263600474ec178bd00f58b2595e4..02bc401eefaecd094f492de53b5eeace06dacb0d 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -540,7 +540,7 @@ static int WindowOpen( vlc_object_t *p_obj )
     p_wnd->handle.xid = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
     if( !p_wnd->handle.xid )
         return VLC_EGENERIC;
-    p_wnd->x11_display = x11_display;
+    p_wnd->display.x11 = x11_display;
 
 #elif defined (Q_WS_WIN)
     p_wnd->handle.hwnd = p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );

diff --git a/modules/video_output/xcb/common.c b/modules/video_output/xcb/common.c
index 4ebc26da555c21048dd5435c79f020b98db9eaaa..9b714f6f6ba52ef6b5ff7fd8da3491f335f1ba9b 100644 (file)
--- a/modules/video_output/xcb/common.c
+++ b/modules/video_output/xcb/common.c
@@ -135,7 +135,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;

diff --git a/modules/video_output/xcb/glx.c b/modules/video_output/xcb/glx.c
index e018a0f34a3d0a5da039645993eabab5360e6ad4..879335ffadb0d91f917c170ce87d949c14d41bc6 100644 (file)
--- a/modules/video_output/xcb/glx.c
+++ b/modules/video_output/xcb/glx.c
@@ -220,7 +220,7 @@ static int Open (vlc_object_t *obj)
     }
 
     /* Connect to X server */
-    Display *dpy = XOpenDisplay (sys->embed->x11_display);
+    Display *dpy = XOpenDisplay (sys->embed->display.x11);
     if (dpy == NULL)
     {
         vout_display_DeleteWindow (vd, sys->embed);

diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 4bf2dce6b2841e8f115f0274682e6231f5d89e6f..57f13dfb7dc1e2fbaf4f6a254b05eb6445ee1a26 100644 (file)
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -265,7 +265,7 @@ static int Open (vlc_object_t *obj)
     }
 
     wnd->handle.xid = window;
-    wnd->x11_display = display;
+    wnd->display.x11 = display;
     wnd->control = Control;
     wnd->sys = p_sys;
 
@@ -374,7 +374,7 @@ static void Close (vlc_object_t *obj)
         DestroyKeyHandler (p_sys->keys);
     }
     xcb_disconnect (conn);
-    free (wnd->x11_display);
+    free (wnd->display.x11);
     free (p_sys);
 }
 

diff --git a/src/video_output/window.c b/src/video_output/window.c
index 093bad58964bcb7da14bb826f4c9619ee9d277a0..a783df5ff5f0c820229948f1da2a1cffe7c5586a 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -67,7 +67,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     case VOUT_WINDOW_TYPE_XID:
         type = "vout window xid";
         window->handle.xid = 0;
-        window->x11_display = NULL;
+        window->display.x11 = NULL;
         break;
     default:
         assert(0);