Fixed crashes

Configuration/Common.xcconfig

@@ -27,10 +27,10 @@ AU_COMPONENT_MANUFACTURER = BRay
 AU_FACTORY_FUNCTION = SimplyLowPassAU.ViewController
 
 // The "build" version -- the `bumpVersions.py -b` option sets this to a date/time stamp
-CURRENT_PROJECT_VERSION = 202411032203898
+CURRENT_PROJECT_VERSION = 202411292203899
 
 // The visible version (eg. 1.2.3)
-MARKETING_VERSION = 5.0.0
+MARKETING_VERSION = 5.0.1
 
 // Copyright notice to put in the Info.plist files
 COPYRIGHT_NOTICE = Copyright © 2024 B-Ray Software

Packages/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.9
+// swift-tools-version:6.0
 
 import PackageDescription
 
@@ -14,8 +14,8 @@ let package = Package(
     .library(name: "UI", targets: ["UI"])
   ],
   dependencies: [
-    .package(url: "https://github.com/bradhowes/AUv3Support", exact: "15.0.2"),
-    // .package(path: "/Users/howes/src/Mine/AUv3Support")
+    // .package(url: "https://github.com/bradhowes/AUv3Support", exact: "16.0.0"),
+    .package(path: "/Users/howes/src/Mine/AUv3Support")
   ],
   targets: [
     .target(

Packages/Sources/UI/FilterView.swift

@@ -32,6 +32,7 @@ public struct FilterViewRanges {
  Delegation protocol for the FilterView. Reports out touch/mouse events and changes to the runtime
  parameters.
  */
+@MainActor
 public protocol FilterViewDelegate: AnyObject {
 
   /// Defines the coordinate spaces for the view in AUParameter units.
@@ -161,52 +162,54 @@ public final class FilterView: View {
   }
 
   override public func awakeFromNib() {
-    os_log(.debug, log: log, "awakeFromNib BEGIN")
-
+    MainActor.assumeIsolated {
+      os_log(.debug, log: log, "awakeFromNib BEGIN")
+
 #if os(macOS)
-    self.wantsLayer = true
+      self.wantsLayer = true
 #endif
-
-    super.awakeFromNib()
-
-    rootLayer.masksToBounds = false
-    rootLayer.contentsScale = screenScale
-
-    plotLayer.name = "plot"
-    plotLayer.anchorPoint = .zero
-    plotLayer.bounds = CGRect(origin: .zero, size: rootLayer.bounds.size)
-    plotLayer.contentsScale = screenScale
-    rootLayer.addSublayer(plotLayer)
-
-    graphLayer.name = "graph"
-    graphLayer.backgroundColor = Color.black.cgColor
-    graphLayer.position = CGPoint(x: yAxisWidth, y: 0.0)
-    graphLayer.anchorPoint = .zero
-    graphLayer.contentsScale = screenScale
-    plotLayer.addSublayer(graphLayer)
-
-    gridLayer.name = "grid"
-    gridLayer.position = .zero
-    gridLayer.anchorPoint = .zero
-    graphLayer.addSublayer(gridLayer)
-
-    curveLayer.name = "curve"
-    curveLayer.anchorPoint = .zero
-    curveLayer.position = .zero
-    graphLayer.addSublayer(curveLayer)
-
-    indicatorLayer.name = "indicator"
-    indicatorLayer.position = .zero
-    indicatorLayer.anchorPoint = .zero
-    graphLayer.addSublayer(indicatorLayer)
-
-    createIndicatorPoint()
-
+      
+      super.awakeFromNib()
+      
+      rootLayer.masksToBounds = false
+      rootLayer.contentsScale = screenScale
+      
+      plotLayer.name = "plot"
+      plotLayer.anchorPoint = .zero
+      plotLayer.bounds = CGRect(origin: .zero, size: rootLayer.bounds.size)
+      plotLayer.contentsScale = screenScale
+      rootLayer.addSublayer(plotLayer)
+      
+      graphLayer.name = "graph"
+      graphLayer.backgroundColor = Color.black.cgColor
+      graphLayer.position = CGPoint(x: yAxisWidth, y: 0.0)
+      graphLayer.anchorPoint = .zero
+      graphLayer.contentsScale = screenScale
+      plotLayer.addSublayer(graphLayer)
+      
+      gridLayer.name = "grid"
+      gridLayer.position = .zero
+      gridLayer.anchorPoint = .zero
+      graphLayer.addSublayer(gridLayer)
+      
+      curveLayer.name = "curve"
+      curveLayer.anchorPoint = .zero
+      curveLayer.position = .zero
+      graphLayer.addSublayer(curveLayer)
+      
+      indicatorLayer.name = "indicator"
+      indicatorLayer.position = .zero
+      indicatorLayer.anchorPoint = .zero
+      graphLayer.addSublayer(indicatorLayer)
+      
+      createIndicatorPoint()
+      
 #if os(macOS)
-    layoutSublayers(of: rootLayer)
+      layoutSublayers(of: rootLayer)
 #endif
-
-    os_log(.debug, log: log, "awakeFromNib END")
+
+      os_log(.debug, log: log, "awakeFromNib END")
+    }
   }
 
 #if os(iOS)

Packages/Sources/UI/FilterViewController.swift

@@ -17,16 +17,17 @@ import os.log
   // NOTE: this special form sets the subsystem name and must run before any other logger calls.
   private let log = Shared.logger(Bundle.main.auBaseName + "AU", "ViewController")
 
-  private var filterView: FilterView!
+  public let kernelBridge = KernelBridge(Bundle.main.auBaseName + "AU")
   private let parameters = Parameters()
 
+  private var filterView: FilterView!
+
   private var viewConfig: AUAudioUnitViewConfiguration!
 
   private var cutoffObserverToken: AUParameterObserverToken?
   private var resonanceObserverToken: AUParameterObserverToken?
   private var currentPresetObserverToken: NSKeyValueObservation?
 
-  public var kernelBridge: KernelBridge?
   public var audioUnit: FilterAudioUnit? {
     didSet {
       DispatchQueue.main.async {
@@ -105,45 +106,55 @@ extension FilterViewController: AudioUnitViewConfigurationManager {}
 // MARK: - AUAudioUnitFactory
 
 extension FilterViewController: AUAudioUnitFactory {
-  @objc public func createAudioUnit(with componentDescription: AudioComponentDescription) throws -> AUAudioUnit {
-    let kernelBridge = KernelBridge(Bundle.main.auBaseName + "AU")
-    self.kernelBridge = kernelBridge
-    let audioUnit = try FilterAudioUnitFactory.create(componentDescription: componentDescription,
-                                                      parameters: parameters, kernel: kernelBridge,
-                                                      viewConfigurationManager: self)
-    self.audioUnit = audioUnit
-
-    currentPresetObserverToken = audioUnit.observe(\.currentPreset, options: []) { object, change in
-      os_log(.error, log: self.log, "currentPreset changed")
-      DispatchQueue.main.async {
-        self.updateDisplay()
-      }
-    }
 
+  // Uff. What a mess to get right. AUv3 infrastructure will invoke on a thread that is probably *not* the main
+  // thread. Be sure to create the audio unit on the main thread and then pass it out. No idea what is actually
+  // done with it.
+  nonisolated public func createAudioUnit(with componentDescription: AudioComponentDescription) throws -> AUAudioUnit {
+    let audioUnit = try DispatchQueue.main.sync {
+      let audioUnit = try FilterAudioUnitFactory.create(componentDescription: componentDescription,
+                                                        viewConfigurationManager: self)
+      self.audioUnit = audioUnit
+      return audioUnit
+    }
     return audioUnit
   }
 }
 
+
 // MARK: - Private
 
 extension FilterViewController {
 
   private func connectViewToAU() {
     os_log(.info, log: log, "connectViewToAU")
 
-    cutoffObserverToken = parameters.cutoff.token(byAddingParameterObserver: { [weak self] address, value in
-      guard let self = self else { return }
-      DispatchQueue.main.async { self.updateDisplay() }
-    })
+    audioUnit?.configure(parameters: parameters, kernel: kernelBridge)
 
-    resonanceObserverToken = parameters.resonance.token(byAddingParameterObserver: { [weak self] address, value in
-      guard let self = self else { return }
-      DispatchQueue.main.async { self.updateDisplay() }
-    })
+    cutoffObserverToken = parameters.cutoff.token(byAddingParameterObserver: parameterChanged(address:value:))
+    resonanceObserverToken = parameters.resonance.token(byAddingParameterObserver: parameterChanged(address:value:))
+    currentPresetObserverToken = audioUnit?.observe(
+      \.currentPreset,
+       options: [],
+       changeHandler: currentPresetChanged(object:change:)
+    )
 
     updateDisplay()
   }
 
+  nonisolated private func parameterChanged(address: AUParameterAddress, value: AUValue) {
+    DispatchQueue.main.async { [weak self] in
+      self?.updateDisplay()
+    }
+  }
+
+  nonisolated private func currentPresetChanged(object: FilterAudioUnit,
+                                                change: NSKeyValueObservedChange<Optional<AUAudioUnitPreset>>) {
+    DispatchQueue.main.async { [weak self] in
+      self?.updateDisplay()
+    }
+  }
+
   private func updateDisplay() {
     os_log(.info, log: log, "updateDisplay BEGIN - cutoff: %f resonance: %f", parameters.cutoff.value,
            parameters.resonance.value)
@@ -161,7 +172,7 @@ extension FilterViewController {
     os_log(.info, log: log, "magnitudes BEGIN - cutoff: %f resonance: %f", parameters.cutoff.value,
            parameters.resonance.value)
     var output: [Float] = Array(repeating: 0.0, count: frequencies.count)
-    kernelBridge?.magnitudes(frequencies, count: frequencies.count, output: &output)
+    kernelBridge.magnitudes(frequencies, count: frequencies.count, output: &output)
     return output
   }
 }