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
8840aa58
Commit
8840aa58
authored
Jul 08, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Correctly close the vout window if there is no video for 1.5sec.
parent
e74dad9a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
11 deletions
+9
-11
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+9
-11
No files found.
modules/gui/macosx/vout.m
View file @
8840aa58
...
@@ -896,6 +896,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -896,6 +896,9 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
frame
:
(
NSRect
*
)
s_arg_frame
showWindow
:
(
BOOL
)
b_show_window
frame
:
(
NSRect
*
)
s_arg_frame
showWindow
:
(
BOOL
)
b_show_window
{
{
BOOL
b_return
;
BOOL
b_return
;
[
NSObject
cancelPreviousPerformRequestsWithTarget
:
o_window
];
b_return
=
[
super
setVout
:
p_arg_vout
subView
:
view
frame
:
s_arg_frame
];
b_return
=
[
super
setVout
:
p_arg_vout
subView
:
view
frame
:
s_arg_frame
];
if
(
b_return
)
if
(
b_return
)
{
{
...
@@ -964,6 +967,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -964,6 +967,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[
self
updateTitle
];
[
self
updateTitle
];
[
NSObject
cancelPreviousPerformRequestsWithTarget
:
o_window
];
/* Make the window the front and key window before animating */
/* Make the window the front and key window before animating */
if
([
o_window
isVisible
]
&&
(
!
[
o_window
isFullscreen
]))
if
([
o_window
isVisible
]
&&
(
!
[
o_window
isFullscreen
]))
[
o_window
makeKeyAndOrderFront
:
self
];
[
o_window
makeKeyAndOrderFront
:
self
];
...
@@ -983,17 +988,10 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
...
@@ -983,17 +988,10 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
void
)
closeVout
-
(
void
)
closeVout
{
{
playlist_t
*
p_playlist
=
pl_Yield
(
VLCIntf
);
/* Don't close the window yet, wait a bit to see if a new input is poping up */
PL_LOCK
;
/* FIXME: Probably fade the window In and Out */
bool
stopped
=
playlist_IsStopped
(
p_playlist
);
/* FIXME: fix core */
PL_UNLOCK
;
[
o_window
performSelector
:
@selector
(
orderOut
:)
withObject
:
nil
afterDelay
:
1
.
5
];
if
(
stopped
)
[
o_window
performSelectorOnMainThread
:
@selector
(
orderOut
:)
withObject
:
self
waitUntilDone
:
YES
];
else
msg_Dbg
(
VLCIntf
,
"we are not closing the window, playlist is playing"
);
vlc_object_release
(
p_playlist
);
[
super
closeVout
];
[
super
closeVout
];
}
}
...
...
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