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
093ffb06
Commit
093ffb06
authored
Feb 13, 2013
by
David Fuhrmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: fix behaviour when changing video splitters on the fly
parent
303f6938
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
modules/gui/macosx/MainWindow.m
modules/gui/macosx/MainWindow.m
+2
-1
modules/gui/macosx/VLCVoutWindowController.m
modules/gui/macosx/VLCVoutWindowController.m
+4
-2
No files found.
modules/gui/macosx/MainWindow.m
View file @
093ffb06
...
@@ -530,7 +530,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
...
@@ -530,7 +530,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
{
{
id
obj
=
[
notification
object
];
id
obj
=
[
notification
object
];
if
([
obj
class
]
==
[
VLCVideoWindowCommon
class
]
||
[
obj
class
]
==
[
VLCDetachedVideoWindow
class
]
||
([
obj
class
]
==
[
VLCMainWindow
class
]
&&
!
b_nonembedded
))
{
// hasActiveVideo is defined for VLCVideoWindowCommon and subclasses
if
([
obj
respondsToSelector
:
@selector
(
hasActiveVideo
)]
&&
[
obj
hasActiveVideo
])
{
if
([[
VLCMain
sharedInstance
]
activeVideoPlayback
])
if
([[
VLCMain
sharedInstance
]
activeVideoPlayback
])
[[
VLCCoreInteraction
sharedInstance
]
stop
];
[[
VLCCoreInteraction
sharedInstance
]
stop
];
}
}
...
...
modules/gui/macosx/VLCVoutWindowController.m
View file @
093ffb06
...
@@ -202,11 +202,13 @@
...
@@ -202,11 +202,13 @@
[
o_window
leaveFullscreen
];
[
o_window
leaveFullscreen
];
[[
o_window
videoView
]
releaseVoutThread
];
[[
o_window
videoView
]
releaseVoutThread
];
[
o_window
setHasActiveVideo
:
NO
];
// set active video to no BEFORE closing the window to avoid stopping playback
// due to NSWindowWillCloseNotification
[
o_window
setHasActiveVideo
:
NO
];
if
(
!
[
NSStringFromClass
([
o_window
class
])
isEqualToString
:
@"VLCMainWindow"
])
{
if
(
!
[
NSStringFromClass
([
o_window
class
])
isEqualToString
:
@"VLCMainWindow"
])
{
[
o_window
close
];
[
o_window
close
];
[
o_window
orderOut
:
self
];
[
o_window
orderOut
:
self
];
// for dark interface
}
}
[
o_vout_dict
removeObjectForKey
:
o_key
];
[
o_vout_dict
removeObjectForKey
:
o_key
];
...
...
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