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
0e4d920e
Commit
0e4d920e
authored
Nov 05, 2006
by
Felix Paul Kühne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* back-port [17498]
parent
a92e6ad7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
modules/gui/macosx/vout.h
modules/gui/macosx/vout.h
+1
-0
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+6
-1
No files found.
modules/gui/macosx/vout.h
View file @
0e4d920e
...
...
@@ -121,6 +121,7 @@
vout_thread_t
*
p_real_vout
;
vlc_bool_t
b_init_ok
;
vlc_bool_t
b_black
;
vlc_bool_t
b_embedded
;
}
-
(
id
)
initWithVout
:
(
vout_thread_t
*
)
p_vout
view
:
(
VLCVoutView
*
)
view
...
...
modules/gui/macosx/vout.m
View file @
0e4d920e
...
...
@@ -919,6 +919,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
p_real_vout
=
[
VLCVoutView
getRealVout
:
p_vout
];
i_device
=
var_GetInteger
(
p_real_vout
->
p_vlc
,
"video-device"
);
b_black
=
var_GetBool
(
p_vout
,
"macosx-black"
);
b_embedded
=
var_GetBool
(
p_vout
,
"macosx-embedded"
);
/* Find out on which screen to open the window */
if
(
i_device
<=
0
||
i_device
>
(
int
)[
o_screens
count
]
)
...
...
@@ -1081,7 +1082,11 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
}
SetSystemUIMode
(
kUIModeNormal
,
0
);
[
super
close
];
[[[[
VLCMain
sharedInstance
]
getControls
]
getFSPanel
]
orderOut
:
self
];
/* this does only work in embedded mode */
if
(
b_embedded
==
VLC_TRUE
)
[[[[
VLCMain
sharedInstance
]
getControls
]
getFSPanel
]
orderOut
:
self
];
return
NULL
;
}
...
...
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