mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2025-01-21 07:08:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Name another anonynous union

Browse Source
This commit is contained in:
Rémi Denis-Courmont 2010-01-30 17:25:51 +02:00
parent e175dcbb1b
commit 65ede56bf2
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vlc_vout_window.h
View File

@ -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)
*

2
modules/gui/qt4/qt4.cpp
View File

@ -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 );

2
modules/video_output/xcb/common.c
View File

@ -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;

2
modules/video_output/xcb/glx.c
View File

@ -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);

4
modules/video_output/xcb/window.c
View File

@ -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);
}

2
src/video_output/window.c
View File

@ -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);