6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-12-25 18:30:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99 from TomHarte/StartupRace

Browse Source 
Resolves a race condition on machine startup
This commit is contained in:
Thomas Harte 2017-02-11 13:18:19 -05:00 committed by GitHub
commit 8c88fd4261
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
OSBindings/Mac/Clock Signal/Documents/MachineDocument.swift
View File

@ -31,24 +31,14 @@ class MachineDocument:
return NSSize(width: 4.0, height: 3.0) return NSSize(width: 4.0, height: 3.0)
} }
@IBOutlet weak var openGLView: CSOpenGLView! { @IBOutlet weak var openGLView: CSOpenGLView!
didSet {
openGLView.delegate = self
openGLView.responderDelegate = self
}
}
@IBOutlet var optionsPanel: MachinePanel! @IBOutlet var optionsPanel: MachinePanel!
@IBAction func showOptions(_ sender: AnyObject!) { @IBAction func showOptions(_ sender: AnyObject!) {
optionsPanel?.setIsVisible(true) optionsPanel?.setIsVisible(true)
} }
fileprivate var audioQueue: CSAudioQueue! = nil fileprivate var audioQueue: CSAudioQueue! = nil
fileprivate lazy var bestEffortUpdater: CSBestEffortUpdater = { fileprivate var bestEffortUpdater: CSBestEffortUpdater!
let updater = CSBestEffortUpdater()
updater.delegate = self
return updater
}()
override var windowNibName: String? { override var windowNibName: String? {
return "MachineDocument" return "MachineDocument"
@ -64,8 +54,16 @@ class MachineDocument:
self.machine.setView(self.openGLView, aspectRatio: Float(displayAspectRatio.width / displayAspectRatio.height)) self.machine.setView(self.openGLView, aspectRatio: Float(displayAspectRatio.width / displayAspectRatio.height))
}) })
setupClockRate()
self.machine.delegate = self self.machine.delegate = self
self.bestEffortUpdater = CSBestEffortUpdater()
self.bestEffortUpdater.delegate = self
// callbacks from the OpenGL may come on a different thread, immediately following the .delegate set;
// hence the full setup of the best-effort updater prior to setting self as a delegate
self.openGLView.delegate = self
self.openGLView.responderDelegate = self
setupClockRate()
self.optionsPanel?.establishStoredOptions() self.optionsPanel?.establishStoredOptions()
// bring OpenGL view-holding window on top of the options panel // bring OpenGL view-holding window on top of the options panel

2
OSBindings/Mac/Clock Signal/Views/CSOpenGLView.h
View File

@ -53,7 +53,7 @@
*/ */
@interface CSOpenGLView : NSOpenGLView @interface CSOpenGLView : NSOpenGLView
@property (nonatomic, weak, nullable) id <CSOpenGLViewDelegate> delegate; @property (atomic, weak, nullable) id <CSOpenGLViewDelegate> delegate;
@property (nonatomic, weak, nullable) id <CSOpenGLViewResponderDelegate> responderDelegate; @property (nonatomic, weak, nullable) id <CSOpenGLViewResponderDelegate> responderDelegate;
/*! /*!