Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
72b44bd5
Commit
72b44bd5
authored
Aug 23, 2008
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
macosx: Save a reference to the view in the voutgl.
parent
9667973b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
modules/gui/macosx/vout.m
modules/gui/macosx/vout.m
+1
-1
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+14
-8
No files found.
modules/gui/macosx/vout.m
View file @
72b44bd5
...
...
@@ -145,7 +145,7 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
-
(
id
)
initWithFrame
:
(
NSRect
)
frameRect
{
[
super
initWithFrame
:
frameRect
];
self
=
[
super
initWithFrame
:
frameRect
];
p_vout
=
NULL
;
o_view
=
nil
;
s_frame
=
&
frameRect
;
...
...
modules/gui/macosx/voutgl.m
View file @
72b44bd5
...
...
@@ -260,7 +260,8 @@ static int Manage( vout_thread_t * p_vout )
p_vout
->
i_changes
&=
~
VOUT_FULLSCREEN_CHANGE
;
}
[
p_vout
->
p_sys
->
o_vout_view
manage
];
if
(
p_vout
->
p_sys
->
o_vout_view
)
[
p_vout
->
p_sys
->
o_vout_view
manage
];
return
VLC_SUCCESS
;
}
...
...
@@ -319,8 +320,10 @@ static void Unlock( vout_thread_t * p_vout )
[
p_vout
->
p_sys
->
o_glview
autorelease
];
/* Spawn the window */
p_vout
->
p_sys
->
o_vout_view
=
[
VLCVoutView
getVoutView
:
p_vout
subView:
p_vout
->
p_sys
->
o_glview
frame
:
nil
];
id
old_vout
=
p_vout
->
p_sys
->
o_vout_view
;
p_vout
->
p_sys
->
o_vout_view
=
[[
VLCVoutView
getVoutView
:
p_vout
subView:
p_vout
->
p_sys
->
o_glview
frame
:
nil
]
retain
];
[
old_vout
release
];
}
/* This function will reset the o_vout_view. It's useful to go fullscreen. */
...
...
@@ -345,15 +348,18 @@ static void Unlock( vout_thread_t * p_vout )
if
(
p_vout
->
p_sys
->
b_saved_frame
)
{
p_vout
->
p_sys
->
o_vout_view
=
[
VLCVoutView
getVoutView
:
p_vout
id
old_vout
=
p_vout
->
p_sys
->
o_vout_view
;
p_vout
->
p_sys
->
o_vout_view
=
[[
VLCVoutView
getVoutView
:
p_vout
subView:
o_glview
frame:
&
p_vout
->
p_sys
->
s_frame
];
frame:
&
p_vout
->
p_sys
->
s_frame
]
retain
];
[
old_vout
release
];
}
else
{
p_vout
->
p_sys
->
o_vout_view
=
[
VLCVoutView
getVoutView
:
p_vout
subView:
o_glview
frame
:
nil
];
id
old_vout
=
p_vout
->
p_sys
->
o_vout_view
;
p_vout
->
p_sys
->
o_vout_view
=
[[
VLCVoutView
getVoutView
:
p_vout
subView:
o_glview
frame
:
nil
]
retain
];
[
old_vout
release
];
}
#undef o_glview
}
...
...
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