Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
35e5155a
Commit
35e5155a
authored
Jul 04, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: factor some common code
parent
e0b3dcd2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
13 deletions
+7
-13
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+7
-13
No files found.
modules/gui/qt4/qt4.cpp
View file @
35e5155a
...
@@ -623,25 +623,19 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
...
@@ -623,25 +623,19 @@ static int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
unsigned
i_width
=
cfg
->
width
;
unsigned
i_width
=
cfg
->
width
;
unsigned
i_height
=
cfg
->
height
;
unsigned
i_height
=
cfg
->
height
;
#if defined (Q_WS_X11)
WId
wid
=
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
p_wnd
->
handle
.
xid
=
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
if
(
!
wid
)
if
(
!
p_wnd
->
handle
.
xid
)
return
VLC_EGENERIC
;
return
VLC_EGENERIC
;
#if defined (Q_WS_X11)
p_wnd
->
handle
.
xid
=
wid
;
p_wnd
->
display
.
x11
=
NULL
;
p_wnd
->
display
.
x11
=
NULL
;
#elif defined (Q_WS_WIN) || defined (Q_WS_PM)
#elif defined (Q_WS_WIN) || defined(Q_WS_PM)
p_wnd
->
handle
.
hwnd
=
(
void
*
)
wid
;
p_wnd
->
handle
.
hwnd
=
(
void
*
)
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
if
(
!
p_wnd
->
handle
.
hwnd
)
return
VLC_EGENERIC
;
#elif defined (Q_WS_MAC)
#elif defined (Q_WS_MAC)
p_wnd
->
handle
.
nsobject
=
(
void
*
)
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
p_wnd
->
handle
.
nsobject
=
(
void
*
)
wid
;
if
(
!
p_wnd
->
handle
.
nsobject
)
return
VLC_EGENERIC
;
#else
#else
# error FIXME
# error FIXME
#endif
#endif
p_wnd
->
control
=
WindowControl
;
p_wnd
->
control
=
WindowControl
;
p_wnd
->
sys
=
(
vout_window_sys_t
*
)
p_mi
;
p_wnd
->
sys
=
(
vout_window_sys_t
*
)
p_mi
;
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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