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

mac: use LogHelper directly instead of mp_log

This commit is contained in:
der richter 2024-03-26 23:32:22 +01:00
parent e7df95b10d
commit ceaabb7b98
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osdep/mac/libmpv_helper.swift
View File

@ -28,9 +28,9 @@ class LibmpvHelper {
var fbo: GLint = 1
let uninitLock = NSLock()
init(_ mpv: OpaquePointer, _ mpLog: OpaquePointer?) {
init(_ mpv: OpaquePointer, _ log: LogHelper) {
self.mpv = mpv
log = LogHelper(mpLog)
self.log = log
}
func initRender() {

6
video/out/cocoa_cb_common.swift
View File

@ -31,10 +31,10 @@ class CocoaCB: Common, EventSubscriber {
var backendState: State = .uninitialized
init(_ mpv: OpaquePointer) {
let newlog = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "cocoacb")
let log = LogHelper(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)
libmpv = LibmpvHelper(mpv, log)
super.init(option, log)
layer = GLLayer(cocoaCB: self)
AppHub.shared.event?.subscribe(self, event: .init(name: "MPV_EVENT_SHUTDOWN"))
}

6
video/out/mac/common.swift
View File

@ -48,9 +48,9 @@ class Common: NSObject {
didSet { if let window = window { window.title = title } }
}
init(_ opt: OptionHelper, _ mpLog: OpaquePointer?) {
option = opt
log = LogHelper(mpLog)
init(_ option: OptionHelper, _ log: LogHelper) {
self.option = option
self.log = log
}
func initMisc(_ vo: UnsafeMutablePointer<vo>) {

4
video/out/mac_common.swift
View File

@ -25,9 +25,9 @@ class MacCommon: Common {
let swapLock: NSCondition = NSCondition()
@objc init(_ vo: UnsafeMutablePointer<vo>) {
let newlog = mp_log_new(vo, vo.pointee.log, "mac")
let log = LogHelper(mp_log_new(vo, vo.pointee.log, "mac"))
let option = OptionHelper(vo, vo.pointee.global)
super.init(option, newlog)
super.init(option, log)
self.vo = vo
input = InputHelper(vo.pointee.input_ctx, option)
timer = PreciseTimer(common: self)