From c1d5b182b4a97b0d505868f68c9c83030c691a23 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sat, 4 Oct 2014 16:26:30 +0200 Subject: cocoa: remove dead code --- video/out/cocoa_common.m | 11 ----------- video/out/gl_cocoa.c | 8 -------- 2 files changed, 19 deletions(-) (limited to 'video/out') diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m index cbfcaa1359..1a8b8a1d31 100644 --- a/video/out/cocoa_common.m +++ b/video/out/cocoa_common.m @@ -71,9 +71,6 @@ struct vo_cocoa_state { IOPMAssertionID power_mgmt_assertion; pthread_mutex_t mutex; - void *ctx; - void (*gl_clear)(void *ctx); - struct mp_log *log; uint32_t old_dwidth; @@ -179,14 +176,6 @@ void vo_cocoa_uninit(struct vo *vo) }); } -void vo_cocoa_register_gl_clear_callback(struct vo *vo, void *ctx, - void (*cb)(void *ctx)) -{ - struct vo_cocoa_state *s = vo->cocoa; - s->ctx = ctx; - s->gl_clear = cb; -} - static int get_screen_handle(struct vo *vo, int identifier, NSWindow *window, NSScreen **screen) { struct vo_cocoa_state *s = vo->cocoa; diff --git a/video/out/gl_cocoa.c b/video/out/gl_cocoa.c index 428dce2e0e..4c07806c77 100644 --- a/video/out/gl_cocoa.c +++ b/video/out/gl_cocoa.c @@ -29,13 +29,6 @@ struct cgl_context { CGLContextObj ctx; }; -static void gl_clear(void *ctx) -{ - struct GL *gl = ctx; - gl->ClearColor(0.0f, 0.0f, 0.0f, 0.0f); - gl->Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); -} - static int set_swap_interval(int enabled) { CGLContextObj ctx = CGLGetCurrentContext(); @@ -128,7 +121,6 @@ static bool config_window_cocoa(struct MPGLContext *ctx, int flags) ctx->gl->SwapInterval = set_swap_interval; vo_cocoa_config_window(ctx->vo, flags, p->ctx); - vo_cocoa_register_gl_clear_callback(ctx->vo, ctx->gl, gl_clear); return true; } -- cgit v1.2.3