Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
c6e47790
Commit
c6e47790
authored
Dec 28, 2007
by
Pierre d'Herbemont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
video_output/opengllayer.m: Fix a warning, and use addVoutLayer: instead of addVoutView:.
parent
85031935
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/video_output/opengllayer.m
modules/video_output/opengllayer.m
+6
-3
No files found.
modules/video_output/opengllayer.m
View file @
c6e47790
...
@@ -66,6 +66,9 @@
...
@@ -66,6 +66,9 @@
# define GL_CLAMP_TO_EDGE 0x812F
# define GL_CLAMP_TO_EDGE 0x812F
#endif
#endif
@interface
VLCVideoView
:
NSObject
-
(
void
)
addVoutLayer
:(
CALayer
*
)
layer
;
@end
/*****************************************************************************
/*****************************************************************************
* Vout interface
* Vout interface
...
@@ -391,7 +394,7 @@ static int InitTextures( vout_thread_t *p_vout )
...
@@ -391,7 +394,7 @@ static int InitTextures( vout_thread_t *p_vout )
{
{
vout_thread_t
*
p_vout
=
[
arg
pointerValue
];
vout_thread_t
*
p_vout
=
[
arg
pointerValue
];
p_vout
->
p_sys
->
o_layer
=
[[
VLCVideoLayer
layerWithVout
:
p_vout
]
retain
];
p_vout
->
p_sys
->
o_layer
=
[[
VLCVideoLayer
layerWithVout
:
p_vout
]
retain
];
[
p_vout
->
p_sys
->
o_cocoa_container
addVout
Subview
:
p_vout
->
p_sys
->
o_layer
];
[
p_vout
->
p_sys
->
o_cocoa_container
addVout
Layer
:
p_vout
->
p_sys
->
o_layer
];
}
}
-
(
void
)
setVout
:(
vout_thread_t
*
)
_p_vout
-
(
void
)
setVout
:(
vout_thread_t
*
)
_p_vout
...
@@ -503,9 +506,9 @@ static int InitTextures( vout_thread_t *p_vout )
...
@@ -503,9 +506,9 @@ static int InitTextures( vout_thread_t *p_vout )
http://developer.apple.com/documentation/GraphicsImaging/
http://developer.apple.com/documentation/GraphicsImaging/
Conceptual/OpenGL/chap5/chapter_5_section_44.html */
Conceptual/OpenGL/chap5/chapter_5_section_44.html */
long
params
[]
=
{
1
}
;
GLint
params
=
1
;
CGLSetParameter
(
CGLGetCurrentContext
(),
kCGLCPSwapInterval
,
CGLSetParameter
(
CGLGetCurrentContext
(),
kCGLCPSwapInterval
,
params
);
&
params
);
CGLUnlockContext
(
context
);
CGLUnlockContext
(
context
);
return
context
;
return
context
;
...
...
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