Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
65ede56b
Commit
65ede56b
authored
Jan 30, 2010
by
Rémi Denis-Courmont
Browse files
Name another anonynous union
parent
e175dcbb
Changes
6
Hide whitespace changes
Inline
Side-by-side
include/vlc_vout_window.h
View file @
65ede56b
...
...
@@ -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)
*
...
...
modules/gui/qt4/qt4.cpp
View file @
65ede56b
...
...
@@ -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
);
...
...
modules/video_output/xcb/common.c
View file @
65ede56b
...
...
@@ -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
;
...
...
modules/video_output/xcb/glx.c
View file @
65ede56b
...
...
@@ -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
);
...
...
modules/video_output/xcb/window.c
View file @
65ede56b
...
...
@@ -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
);
}
...
...
src/video_output/window.c
View file @
65ede56b
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment