summaryrefslogtreecommitdiffstats
path: root/video/out/cocoa-cb/video_layer.swift
diff options
context:
space:
mode:
authorAkemi <der.richter@gmx.de>2018-02-28 15:08:41 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-04 16:26:35 -0800
commitae2972557f555a11591082c213e653ac68a01f23 (patch)
tree5f4757e0b70ad8344158c433b9903c35970645b5 /video/out/cocoa-cb/video_layer.swift
parentd7b6ebf64391327c60bdf50becd945f6237e5c9e (diff)
downloadmpv-ae2972557f555a11591082c213e653ac68a01f23.tar.bz2
mpv-ae2972557f555a11591082c213e653ac68a01f23.tar.xz
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.
Diffstat (limited to 'video/out/cocoa-cb/video_layer.swift')
-rw-r--r--video/out/cocoa-cb/video_layer.swift14
1 files changed, 7 insertions, 7 deletions
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) &&