mac/option: make option helper vo struct independent

der richter committed 2 years ago

Commit 6defd491 parent 90c534a4 files · +12 −12Browse files

Unified · Split

4 files

@@ -20,7 +20,6 @@ import Cocoa · 19 unmodified lines
20	20	typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)?
21	21
22	22	class OptionHelper: NSObject {
23		− var vo: UnsafeMutablePointer<vo>
24	23	var optsCachePtr: UnsafeMutablePointer<m_config_cache>
25	24	var macOptsCachePtr: UnsafeMutablePointer<m_config_cache>
26	25
@@ -35,11 +34,9 @@ class OptionHelper: NSObject { · 8 unmodified lines
35	34	var opts: mp_vo_opts { get { return optsPtr.pointee } }
36	35	var macOpts: macos_opts { get { return macOptsPtr.pointee } }
37	36
38		− init(_ vo: UnsafeMutablePointer<vo>) {
39		− self.vo = vo
40		−
41		− guard let cache = m_config_cache_alloc(vo, vo.pointee.global, Application.getVoSubConf()),
42		− let macCache = m_config_cache_alloc(vo, vo.pointee.global, Application.getMacOSConf()) else
	37	+ init(_ taParent: UnsafeMutableRawPointer, _ global: OpaquePointer?) {
	38	+ guard let cache = m_config_cache_alloc(taParent, global, Application.getVoSubConf()),
	39	+ let macCache = m_config_cache_alloc(taParent, global, Application.getMacOSConf()) else
43	40	{
44	41	// will never be hit, mp_get_config_group asserts for invalid groups
45	42	exit(1)

@@ -35,11 +35,12 @@ class CocoaCB: Common { · 34 unmodified lines
35	35	let newlog = mp_log_new(UnsafeMutablePointer<MPContext>(mpvHandle), mp_client_get_log(mpvHandle), "cocoacb")
36	36	libmpv = LibmpvHelper(mpvHandle, newlog)
37	37	super.init(newlog)
	38	+ option = OptionHelper(UnsafeMutablePointer(mpvHandle), mp_client_get_global(mpvHandle))
38	39	layer = GLLayer(cocoaCB: self)
39	40	}
40	41
41	42	func preinit(_ vo: UnsafeMutablePointer<vo>) {
42		− option = OptionHelper(vo)
	43	+ self.vo = vo
43	44	input = InputHelper(vo.pointee.input_ctx, option)
44	45
45	46	if backendState == .uninitialized {
@@ -62,7 +63,7 @@ class CocoaCB: Common { · 16 unmodified lines
62	63	}
63	64
64	65	func reconfig(_ vo: UnsafeMutablePointer<vo>) {
65		− option?.vo = vo
	66	+ self.vo = vo
66	67	if backendState == .needsInit {
67	68	DispatchQueue.main.sync { self.initBackend(vo) }
68	69	} else if option?.opts.auto_window_resize ?? true {

@@ -22,6 +22,7 @@ class Common: NSObject { · 21 unmodified lines
22	22	var option: OptionHelper?
23	23	var input: InputHelper?
24	24	var log: LogHelper
	25	+ var vo: UnsafeMutablePointer<vo>?
25	26	let queue: DispatchQueue = DispatchQueue(label: "io.mpv.queue")
26	27
27	28	@objc var window: Window?
@@ -483,11 +484,11 @@ class Common: NSObject { · 455 unmodified lines
483	484	events \|= ev
484	485	eventsLock.unlock()
485	486
486		− guard let vout = option?.vo else {
	487	+ guard let vo = vo else {
487	488	log.sendWarning("vo nil in flagEvents")
488	489	return
489	490	}
490		− vo_wakeup(vout)
	491	+ vo_wakeup(vo)
491	492	}
492	493
493	494	func checkEvents() -> Int {

@@ -27,7 +27,8 @@ class MacCommon: Common { · 26 unmodified lines
27	27	@objc init(_ vo: UnsafeMutablePointer<vo>) {
28	28	let newlog = mp_log_new(vo, vo.pointee.log, "mac")
29	29	super.init(newlog)
30		− option = OptionHelper(vo)
	30	+ self.vo = vo
	31	+ option = OptionHelper(vo, vo.pointee.global)
31	32	input = InputHelper(vo.pointee.input_ctx, option)
32	33	timer = PreciseTimer(common: self)
33	34
@@ -38,7 +39,7 @@ class MacCommon: Common { · 4 unmodified lines
38	39	}
39	40
40	41	@objc func config(_ vo: UnsafeMutablePointer<vo>) -> Bool {
41		− option?.vo = vo
	42	+ self.vo = vo
42	43
43	44	DispatchQueue.main.sync {
44	45	let previousActiveApp = getActiveApp()

Keyboard shortcuts