diff --git a/osdep/mac/app_hub.swift b/osdep/mac/app_hub.swift index d1321a19f769e..82307244212d3 100644 --- a/osdep/mac/app_hub.swift +++ b/osdep/mac/app_hub.swift @@ -51,19 +51,28 @@ class AppHub: NSObject { } @objc func initMpv(_ mpv: OpaquePointer) { - log.log = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "app") - option = OptionHelper(UnsafeMutablePointer(mpv), mp_client_get_global(mpv)) - input.option = option + print("-------- initMpv1") event = EventHelper(self, mpv) - self.mpv = event?.mpv + print("-------- initMpv2") + if let mpv = event?.mpv { + print("-------- initMpv2.1") + self.mpv = mpv + log.log = mp_log_new(UnsafeMutablePointer(mpv), mp_client_get_log(mpv), "app") + option = OptionHelper(UnsafeMutablePointer(mpv), mp_client_get_global(mpv)) + input.option = option + } #if HAVE_MACOS_MEDIA_PLAYER + print("-------- initMpv3.1") remote?.registerEvents() #endif #if HAVE_MACOS_TOUCHBAR + print("-------- initMpv3.2") touchBar = TouchBar(self) #endif + print("-------- initMpv4") log.verbose("AppHub functionality initialised") + print("-------- initMpv5") } @objc func initInput(_ input: OpaquePointer?) { diff --git a/osdep/mac/event_helper.swift b/osdep/mac/event_helper.swift index 277a9aa08d063..53453d389a47b 100644 --- a/osdep/mac/event_helper.swift +++ b/osdep/mac/event_helper.swift @@ -66,7 +66,9 @@ class EventHelper { init?(_ appHub: AppHub, _ mpv: OpaquePointer) { if !appHub.isApplication { + print("------- mpv_destroy(mpv)") mpv_destroy(mpv) + print("------- mpv_destroy(mpv)2") return nil } diff --git a/osdep/mac/log_helper.swift b/osdep/mac/log_helper.swift index 0f65975da1209..784054e364232 100644 --- a/osdep/mac/log_helper.swift +++ b/osdep/mac/log_helper.swift @@ -50,12 +50,16 @@ class LogHelper { } func send(message: String, type: Int) { - guard let log = log, UnsafeRawPointer(log).load(as: UInt8.self) != 0 else { + print("------- send(message:)0 \(message)") + guard let log = log/*, UnsafeRawPointer(log).load(as: UInt8.self) != 0*/ else { + print("------- send(message:)1") logger.log(level: loggerMapping[type] ?? .default, "\(message, privacy: .public)") + print("------- send(message:)2") return } - + print("------- send(message:)1.1") let args: [CVarArg] = [(message as NSString).utf8String ?? "NO MESSAGE"] mp_msg_va(log, Int32(type), "%s\n", getVaList(args)) + print("------- send(message:)1.2") } }