Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
65c4bea6
Commit
65c4bea6
authored
Feb 22, 2014
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: better check if we can open the new vout within the main window
fixes #9919
parent
997fc467
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
modules/gui/macosx/VLCVoutWindowController.h
modules/gui/macosx/VLCVoutWindowController.h
+2
-0
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+5
-1
No files found.
modules/gui/macosx/VLCVoutWindowController.h
View file @
65c4bea6
...
...
@@ -38,6 +38,8 @@
// save the status level if at least one video window is on status level
NSUInteger
i_statusLevelWindowCounter
;
NSInteger
i_currentWindowLevel
;
BOOL
b_mainwindow_has_video
;
}
@property
(
readonly
,
nonatomic
)
NSInteger
currentWindowLevel
;
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
65c4bea6
...
...
@@ -129,10 +129,11 @@
[[
VLCMainWindow
sharedInstance
]
setNonembedded
:
YES
];
b_nonembedded
=
YES
;
}
else
{
if
((
var_InheritBool
(
VLCIntf
,
"embedded-video"
)
&&
!
b_m
ultiple_vout_windows
))
{
if
((
var_InheritBool
(
VLCIntf
,
"embedded-video"
)
&&
!
b_m
ainwindow_has_video
))
{
// setup embedded video
o_vout_view
=
[[[
VLCMainWindow
sharedInstance
]
videoView
]
retain
];
o_new_video_window
=
[[
VLCMainWindow
sharedInstance
]
retain
];
b_mainwindow_has_video
=
YES
;
b_nonembedded
=
NO
;
}
else
{
// setup detached window with controls
...
...
@@ -243,6 +244,9 @@
return
;
}
if
([
o_window
class
]
==
[
VLCMainWindow
class
])
b_mainwindow_has_video
=
NO
;
if
([
o_window
fullscreen
]
&&
!
[[
VLCMainWindow
sharedInstance
]
nativeFullscreenMode
])
[
o_window
leaveFullscreen
];
...
...
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