From ae2972557f555a11591082c213e653ac68a01f23 Mon Sep 17 00:00:00 2001 From: Akemi Date: Wed, 28 Feb 2018 15:08:41 +0100 Subject: cocoa-cb: use new libmpv API instead of opengl-cb a new replacement API was introduced with b037121 and the old one was deprecated. porting cocoa-cb to the new API. --- video/out/cocoa-cb/video_layer.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'video/out/cocoa-cb/video_layer.swift') diff --git a/video/out/cocoa-cb/video_layer.swift b/video/out/cocoa-cb/video_layer.swift index 8e2eee621b..c5604b88f7 100644 --- a/video/out/cocoa-cb/video_layer.swift +++ b/video/out/cocoa-cb/video_layer.swift @@ -76,10 +76,10 @@ class VideoLayer: CAOpenGLLayer { fatalError("init(coder:) has not been implemented") } - func setUpGLCB() { - self.mpv.initGLCB() - self.mpv.setGLCBUpdateCallback(self.updateCallback, context: self) - self.mpv.setGLCBControlCallback(self.cocoaCB.controlCallback, context: self.cocoaCB) + func setUpRender() { + mpv.initRender() + mpv.setRenderUpdateCallback(updateCallback, context: self) + mpv.setRenderControlCallback(cocoaCB.controlCallback, context: cocoaCB) } override func canDraw(inCGLContext ctx: CGLContextObj, @@ -114,7 +114,7 @@ class VideoLayer: CAOpenGLLayer { } } - mpv.drawGLCB(surfaceSize!) + mpv.drawRender(surfaceSize!) CGLFlushDrawable(ctx) drawLock.unlock() @@ -200,7 +200,7 @@ class VideoLayer: CAOpenGLLayer { return ctx } - let updateCallback: mpv_opengl_cb_update_fn = { (ctx) in + let updateCallback: mpv_render_update_fn = { (ctx) in let layer: VideoLayer = MPVHelper.bridge(ptr: ctx!) layer.neededFlips += 1 } @@ -218,7 +218,7 @@ class VideoLayer: CAOpenGLLayer { } func reportFlip() { - mpv.reportGLCBFlip() + mpv.reportRenderFlip() videoLock.lock() if !isAsynchronous && neededFlips > 0 && hasVideo { if !cocoaCB.window.occlusionState.contains(.visible) && -- cgit v1.2.3