github
/
mpv
mirror of https://github.com/mpv-player/mpv
1
Fork 0
Code Releases Activity

mac: rename mpvHandle to mpv

This commit is contained in:
der richter 2024-03-26 23:21:34 +01:00
parent e71e340b77
commit e7df95b10d
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osdep/mac/event_helper.swift
View File

@ -62,15 +62,15 @@ class EventHelper {
var mpv: OpaquePointer?
var events: [String:[Int:EventSubscriber]] = [:]
init?(_ appHub: AppHub, _ mpvHandle: OpaquePointer) {
init?(_ appHub: AppHub, _ mpv: OpaquePointer) {
if !appHub.isApplication {
mpv_destroy(mpvHandle)
mpv_destroy(mpv)
return nil
}
self.appHub = appHub
self.mpv = mpvHandle
mpv_set_wakeup_callback(mpvHandle, wakeup, TypeHelper.bridge(obj: self))
self.mpv = mpv
mpv_set_wakeup_callback(mpv, wakeup, TypeHelper.bridge(obj: self))
}
func subscribe(_ subscriber: any EventSubscriber, event: Event) {

10
osdep/mac/libmpv_helper.swift
View File

@ -23,13 +23,13 @@ let glDummy: @convention(c) () -> Void = {}
class LibmpvHelper {
var log: LogHelper
var mpvHandle: OpaquePointer?
var mpv: OpaquePointer?
var mpvRenderContext: OpaquePointer?
var fbo: GLint = 1
let uninitLock = NSLock()
init(_ mpv: OpaquePointer, _ mpLog: OpaquePointer?) {
mpvHandle = mpv
self.mpv = mpv
log = LogHelper(mpLog)
}
@ -47,7 +47,7 @@ class LibmpvHelper {
mpv_render_param()
]
if (mpv_render_context_create(&mpvRenderContext, mpvHandle, &params) < 0) {
if (mpv_render_context_create(&mpvRenderContext, mpv, &params) < 0) {
log.sendError("Render context init has failed.")
exit(1)
}
@ -174,8 +174,8 @@ class LibmpvHelper {
uninitLock.lock()
mpv_render_context_free(mpvRenderContext)
mpvRenderContext = nil
mpv_destroy(mpvHandle)
mpvHandle = nil
mpv_destroy(mpv)
mpv = nil
uninitLock.unlock()
}
}

9
video/out/cocoa_cb_common.swift
View File

@ -30,11 +30,10 @@ class CocoaCB: Common, EventSubscriber {
}
var backendState: State = .uninitialized
init(_ mpvHandle: OpaquePointer) {
let newlog = mp_log_new(UnsafeMutablePointer(mpvHandle), mp_client_get_log(mpvHandle), "cocoacb")
let option = OptionHelper(UnsafeMutablePointer(mpvHandle), mp_client_get_global(mpvHandle))
libmpv = LibmpvHelper(mpvHandle, newlog)
init(_ mpv: OpaquePointer) {
let newlog = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "cocoacb")
let option = OptionHelper(UnsafeMutablePointer(mpv), mp_client_get_global(mpv))
libmpv = LibmpvHelper(mpv, newlog)
super.init(option, newlog)
layer = GLLayer(cocoaCB: self)
AppHub.shared.event?.subscribe(self, event: .init(name: "MPV_EVENT_SHUTDOWN"))