mac: use LogHelper directly instead of mp_log

der richter committed 2 years ago

Commit ceaabb71 parent e7df95b4 files · +10 −10Browse files

Unified · Split

4 files

osdep/mac/libmpv_helper.swift +2 −2
video/out/cocoa_cb_common.swift +3 −3
video/out/mac/common.swift +3 −3
video/out/mac_common.swift +2 −2

osdep/mac/libmpv_helper.swift+2−2

@@ -28,9 +28,9 @@ class LibmpvHelper { · 27 unmodified lines
28	28	var fbo: GLint = 1
29	29	let uninitLock = NSLock()
30	30
31		− init(_ mpv: OpaquePointer, _ mpLog: OpaquePointer?) {
	31	+ init(_ mpv: OpaquePointer, _ log: LogHelper) {
32	32	self.mpv = mpv
33		− log = LogHelper(mpLog)
	33	+ self.log = log
34	34	}
35	35
36	36	func initRender() {

video/out/cocoa_cb_common.swift+3−3

@@ -31,10 +31,10 @@ class CocoaCB: Common, EventSubscriber { · 30 unmodified lines
31	31	var backendState: State = .uninitialized
32	32
33	33	init(_ mpv: OpaquePointer) {
34		− let newlog = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "cocoacb")
	34	+ let log = LogHelper(mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "cocoacb"))
35	35	let option = OptionHelper(UnsafeMutablePointer(mpv), mp_client_get_global(mpv))
36		− libmpv = LibmpvHelper(mpv, newlog)
37		− super.init(option, newlog)
	36	+ libmpv = LibmpvHelper(mpv, log)
	37	+ super.init(option, log)
38	38	layer = GLLayer(cocoaCB: self)
39	39	AppHub.shared.event?.subscribe(self, event: .init(name: "MPV_EVENT_SHUTDOWN"))
40	40	}

video/out/mac/common.swift+3−3

@@ -48,9 +48,9 @@ class Common: NSObject { · 47 unmodified lines
48	48	didSet { if let window = window { window.title = title } }
49	49	}
50	50
51		− init(_ opt: OptionHelper, _ mpLog: OpaquePointer?) {
52		− option = opt
53		− log = LogHelper(mpLog)
	51	+ init(_ option: OptionHelper, _ log: LogHelper) {
	52	+ self.option = option
	53	+ self.log = log
54	54	}
55	55
56	56	func initMisc(_ vo: UnsafeMutablePointer<vo>) {

video/out/mac_common.swift+2−2

@@ -25,9 +25,9 @@ class MacCommon: Common { · 24 unmodified lines
25	25	let swapLock: NSCondition = NSCondition()
26	26
27	27	@objc init(_ vo: UnsafeMutablePointer<vo>) {
28		− let newlog = mp_log_new(vo, vo.pointee.log, "mac")
	28	+ let log = LogHelper(mp_log_new(vo, vo.pointee.log, "mac"))
29	29	let option = OptionHelper(vo, vo.pointee.global)
30		− super.init(option, newlog)
	30	+ super.init(option, log)
31	31	self.vo = vo
32	32	input = InputHelper(vo.pointee.input_ctx, option)
33	33	timer = PreciseTimer(common: self)