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
352fb477
Commit
352fb477
authored
Jul 24, 2010
by
Juho Vähä-Herttua
Committed by
Rémi Denis-Courmont
Jul 24, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qt4: Add OSX support to embedded video
Signed-off-by:
Rémi Denis-Courmont
<
remi@remlab.net
>
parent
1eb0e681
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+8
-1
No files found.
modules/gui/qt4/qt4.cpp
View file @
352fb477
...
...
@@ -248,12 +248,14 @@ vlc_module_begin ()
set_callbacks
(
OpenDialogs
,
Close
)
#if defined(Q_WS_X11) || defined(Q_WS_WIN)
#if defined(Q_WS_X11) || defined(Q_WS_WIN)
|| defined(Q_WS_MAC)
add_submodule
()
#if defined(Q_WS_X11)
set_capability
(
"vout window xid"
,
0
)
#elif defined(Q_WS_WIN)
set_capability
(
"vout window hwnd"
,
0
)
#elif defined(Q_WS_MAC)
set_capability
(
"vout window nsobject"
,
0
)
#endif
set_callbacks
(
WindowOpen
,
WindowClose
)
#endif
...
...
@@ -574,6 +576,11 @@ static int WindowOpen( vlc_object_t *p_obj )
p_wnd
->
handle
.
hwnd
=
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
if
(
!
p_wnd
->
handle
.
hwnd
)
return
VLC_EGENERIC
;
#elif defined (Q_WS_MAC)
p_wnd
->
handle
.
nsobject
=
(
void
*
)
p_mi
->
getVideo
(
&
i_x
,
&
i_y
,
&
i_width
,
&
i_height
);
if
(
!
p_wnd
->
handle
.
nsobject
)
return
VLC_EGENERIC
;
#else
# error FIXME
#endif
...
...
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