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
f859ce05
Commit
f859ce05
authored
Oct 05, 2004
by
Derk-Jan Hartman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* Disabled the OSX OpenGL vout untill it's problems are fixed
parent
a020907c
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
1 deletion
+32
-1
modules/gui/macosx/voutgl.m
modules/gui/macosx/voutgl.m
+32
-1
No files found.
modules/gui/macosx/voutgl.m
View file @
f859ce05
...
...
@@ -69,6 +69,7 @@ struct vout_sys_t
static
int
Init
(
vout_thread_t
*
p_vout
);
static
void
End
(
vout_thread_t
*
p_vout
);
static
int
Manage
(
vout_thread_t
*
p_vout
);
static
int
Control
(
vout_thread_t
*
,
int
,
va_list
);
static
void
Swap
(
vout_thread_t
*
p_vout
);
int
E_
(
OpenVideoGL
)
(
vlc_object_t
*
p_this
)
...
...
@@ -77,10 +78,18 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
int
i_timeout
;
vlc_value_t
val
;
/* OpenGL interface disabled until
* - the video on top var is properly working
* - the escape key is working in fullscreen
* - the green line is gone
* - other problems?????
*/
return
(
1
);
if
(
!
CGDisplayUsesOpenGLAcceleration
(
kCGDirectMainDisplay
)
)
{
msg_Warn
(
p_vout
,
"no hardware acceleration"
);
return
VLC_EGENERIC
;
return
(
1
)
;
}
msg_Dbg
(
p_vout
,
"display is Quartz Extreme accelerated"
);
...
...
@@ -112,6 +121,7 @@ int E_(OpenVideoGL) ( vlc_object_t * p_this )
p_vout
->
pf_init
=
Init
;
p_vout
->
pf_end
=
End
;
p_vout
->
pf_manage
=
Manage
;
p_vout
->
pf_control
=
Control
;
p_vout
->
pf_swap
=
Swap
;
...
...
@@ -248,6 +258,27 @@ static int Manage( vout_thread_t * p_vout )
return
VLC_SUCCESS
;
}
/*****************************************************************************
* Control: control facility for the vout
*****************************************************************************/
static
int
Control
(
vout_thread_t
*
p_vout
,
int
i_query
,
va_list
args
)
{
vlc_bool_t
b_arg
;
switch
(
i_query
)
{
case
VOUT_SET_STAY_ON_TOP
:
b_arg
=
va_arg
(
args
,
vlc_bool_t
);
[
p_vout
->
p_sys
->
o_window
setOnTop
:
b_arg
];
return
VLC_SUCCESS
;
case
VOUT_CLOSE
:
case
VOUT_REPARENT
:
default:
return
vout_vaControlDefault
(
p_vout
,
i_query
,
args
);
}
}
static
void
Swap
(
vout_thread_t
*
p_vout
)
{
[[
p_vout
->
p_sys
->
o_glview
openGLContext
]
makeCurrentContext
];
...
...
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