summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa_common.m
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-10-01 22:25:12 +0200
committerwm4 <wm4@nowhere>2015-10-01 22:42:25 +0200
commitf4d62da8f028bb2359a9a4c6792690cfa5bc8930 (patch)
tree458a2be844057c4d87055089d36a640b28cfa595 /video/out/cocoa_common.m
parentae7212963ee55c11cf025beccf86c55c1d898128 (diff)
downloadmpv-f4d62da8f028bb2359a9a4c6792690cfa5bc8930.tar.bz2
mpv-f4d62da8f028bb2359a9a4c6792690cfa5bc8930.tar.xz
vo_opengl: cocoa: switch to new internal API
Diffstat (limited to 'video/out/cocoa_common.m')
-rw-r--r--video/out/cocoa_common.m7
1 files changed, 3 insertions, 4 deletions
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index f16f7aef0d..d4f70c9f90 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -248,7 +248,7 @@ static void cocoa_uninit_light_sensor(struct vo_cocoa_state *s)
}
}
-int vo_cocoa_init(struct vo *vo)
+void vo_cocoa_init(struct vo *vo)
{
struct vo_cocoa_state *s = talloc_zero(NULL, struct vo_cocoa_state);
*s = (struct vo_cocoa_state){
@@ -265,7 +265,6 @@ int vo_cocoa_init(struct vo *vo)
pthread_cond_init(&s->wakeup, NULL);
vo->cocoa = s;
cocoa_init_light_sensor(vo);
- return 1;
}
static int vo_cocoa_set_cursor_visibility(struct vo *vo, bool *visible)
@@ -554,7 +553,7 @@ void vo_cocoa_set_opengl_ctx(struct vo *vo, CGLContextObj ctx)
});
}
-int vo_cocoa_config_window(struct vo *vo, uint32_t flags)
+int vo_cocoa_config_window(struct vo *vo)
{
struct vo_cocoa_state *s = vo->cocoa;
run_on_main_thread(vo, ^{
@@ -572,7 +571,7 @@ int vo_cocoa_config_window(struct vo *vo, uint32_t flags)
s->old_dwidth = width;
s->old_dheight = height;
- if (!(flags & VOFLAG_HIDDEN) && !s->view) {
+ if (!s->view) {
create_ui(vo, &geo.win, geo.flags);
}