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
1cd23817
Commit
1cd23817
authored
Mar 17, 2009
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
safari: fix crash on exit after going fullscreen in webbrowser plugin.
parent
037a2d7f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
6 deletions
+25
-6
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+25
-6
No files found.
modules/gui/macosx/voutgl.m
View file @
1cd23817
...
...
@@ -203,7 +203,11 @@ void CloseVideoGL ( vlc_object_t * p_this )
if
(
p_vout
->
p_sys
->
b_embedded
)
{
aglDestroyContext
(
p_vout
->
p_sys
->
agl_ctx
);
if
(
p_vout
->
p_sys
->
agl_ctx
)
{
aglEnd
(
p_vout
);
aglDestroyContext
(
p_vout
->
p_sys
->
agl_ctx
);
}
}
else
if
(
VLCIntf
&&
vlc_object_alive
(
VLCIntf
))
{
...
...
@@ -526,7 +530,11 @@ static int aglInit( vout_thread_t * p_vout )
static
void
aglEnd
(
vout_thread_t
*
p_vout
)
{
aglSetCurrentContext
(
NULL
);
if
(
p_vout
->
p_sys
->
theWindow
)
DisposeWindow
(
p_vout
->
p_sys
->
theWindow
);
if
(
p_vout
->
p_sys
->
theWindow
)
{
DisposeWindow
(
p_vout
->
p_sys
->
theWindow
);
p_vout
->
p_sys
->
theWindow
=
NULL
;
}
}
static
void
aglReshape
(
vout_thread_t
*
p_vout
)
...
...
@@ -623,11 +631,17 @@ static int aglManage( vout_thread_t * p_vout )
aglSetCurrentContext
(
p_vout
->
p_sys
->
agl_ctx
);
aglSetViewport
(
p_vout
,
viewBounds
,
clipBounds
);
/* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty update to the main thread */
sendEventToMainThread
(
GetWindowEventTarget
(
p_vout
->
p_sys
->
theWindow
),
kEventClassVLCPlugin
,
kEventVLCPluginHideFullscreen
);
if
(
p_vout
->
p_sys
->
theWindow
)
{
/* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty
* update to the main thread */
sendEventToMainThread
(
GetWindowEventTarget
(
p_vout
->
p_sys
->
theWindow
),
kEventClassVLCPlugin
,
kEventVLCPluginHideFullscreen
);
}
}
else
{
/* Go into fullscreen */
Rect
deviceRect
;
GDHandle
deviceHdl
=
GetMainDevice
();
...
...
@@ -685,8 +699,13 @@ static int aglManage( vout_thread_t * p_vout )
aglSetViewport
(
p_vout
,
deviceRect
,
deviceRect
);
//aglSetFullScreen(p_vout->p_sys->agl_ctx, device_width, device_height, 0, 0);
/* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty update to the main thread */
sendEventToMainThread
(
GetWindowEventTarget
(
p_vout
->
p_sys
->
theWindow
),
kEventClassVLCPlugin
,
kEventVLCPluginShowFullscreen
);
if
(
p_vout
->
p_sys
->
theWindow
)
{
/* Most Carbon APIs are not thread-safe, therefore delagate some GUI visibilty
* update to the main thread */
sendEventToMainThread
(
GetWindowEventTarget
(
p_vout
->
p_sys
->
theWindow
),
kEventClassVLCPlugin
,
kEventVLCPluginShowFullscreen
);
}
}
aglReshape
(
p_vout
);
aglUnlock
(
p_vout
);
...
...
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