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
fc9987fa
Commit
fc9987fa
authored
May 29, 2009
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx vout: fix fullscreen behaviour on eof.
Fixes a bug introduced on [
795fa06c
] Closes #2794
parent
8710885a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
22 deletions
+7
-22
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+7
-22
No files found.
modules/gui/macosx/voutgl.m
View file @
fc9987fa
...
@@ -211,38 +211,24 @@ void CloseVideoGL ( vlc_object_t * p_this )
...
@@ -211,38 +211,24 @@ void CloseVideoGL ( vlc_object_t * p_this )
msg_Dbg
(
p_this
,
"Closing"
);
msg_Dbg
(
p_this
,
"Closing"
);
#ifndef __x86_64__
#ifndef __x86_64__
/* If the fullscreen window is still open, close it */
if
(
p_vout
->
p_sys
->
b_embedded
)
if
(
p_vout
->
b_fullscreen
)
{
{
p_vout
->
i_changes
|=
VOUT_FULLSCREEN_CHANGE
;
/* If the fullscreen window is still open, close it */
if
(
p_vout
->
p_sys
->
b_embedded
)
if
(
p_vout
->
b_fullscreen
)
{
{
p_vout
->
i_changes
|=
VOUT_FULLSCREEN_CHANGE
;
aglManage
(
p_vout
);
aglManage
(
p_vout
);
var_SetBool
(
p_vout
->
p_parent
,
"fullscreen"
,
false
);
var_SetBool
(
p_vout
->
p_parent
,
"fullscreen"
,
false
);
}
}
else
Manage
(
p_vout
);
}
if
(
p_vout
->
p_sys
->
b_embedded
)
{
if
(
p_vout
->
p_sys
->
agl_ctx
)
if
(
p_vout
->
p_sys
->
agl_ctx
)
{
{
aglEnd
(
p_vout
);
aglEnd
(
p_vout
);
aglDestroyContext
(
p_vout
->
p_sys
->
agl_ctx
);
aglDestroyContext
(
p_vout
->
p_sys
->
agl_ctx
);
}
}
}
}
else
if
(
VLCIntf
&&
vlc_object_alive
(
VLCIntf
))
else
{
#endif
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
if
(
VLCIntf
&&
vlc_object_alive
(
VLCIntf
))
/* Close the window */
[
p_vout
->
p_sys
->
o_vout_view
performSelectorOnMainThread
:
@selector
(
closeVout
)
withObject
:
NULL
waitUntilDone
:
YES
];
[
o_pool
release
];
}
#else
if
(
VLCIntf
&&
vlc_object_alive
(
VLCIntf
))
{
{
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
NSAutoreleasePool
*
o_pool
=
[[
NSAutoreleasePool
alloc
]
init
];
...
@@ -251,7 +237,6 @@ void CloseVideoGL ( vlc_object_t * p_this )
...
@@ -251,7 +237,6 @@ void CloseVideoGL ( vlc_object_t * p_this )
[
o_pool
release
];
[
o_pool
release
];
}
}
#endif
/* Clean up */
/* Clean up */
free
(
p_vout
->
p_sys
);
free
(
p_vout
->
p_sys
);
}
}
...
...
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