Updated dynamic oscillator to use protocol

Author: aure

Package.resolved

@@ -9,7 +9,7 @@ import CAudioKitEX
 /// Reads from the table sequentially and repeatedly at given frequency.
 /// Linear interpolation is applied for table look up from internal phase values.
 ///
-public class DynamicOscillator: Node {
+public class DynamicOscillator: DynamicWaveformNode {
 
     /// Connected nodes
     public var connections: [Node] { [] }
@@ -20,7 +20,7 @@ public class DynamicOscillator: Node {
     fileprivate var waveform: Table?
 
     /// Callback whten the wavetable is updated
-    public var wavetableUpdateHandler: ([Float]) -> Void = { _ in }
+    var waveformUpdateHandler: ([Float]) -> Void = { _ in }
 
     /// Specification details for frequency
     public static let frequencyDef = NodeParameterDef(
@@ -100,20 +100,24 @@ public class DynamicOscillator: Node {
 
     }
 
-    // MARK: - Public Methods
+    // MARK: - Protocol methods
 
     /// Sets the wavetable of the oscillator node
-    ///
-    /// - Parameters:
-    ///   - waveform: The waveform of oscillation
-    public func setWaveTable(waveform: Table) {
+    /// - Parameter waveform: The waveform of oscillation
+    public func setWaveform(_ waveform: Table) {
         au.setWavetable(waveform.content)
         self.waveform = waveform
-        wavetableUpdateHandler(waveform.content)
+        waveformUpdateHandler(waveform.content)
     }
 
     /// Gets the floating point values stored in the oscillator's wavetable
-    public func getWavetableValues() -> [Float] {
+    public func getWaveformValues() -> [Float] {
         return waveform?.content ?? []
     }
+    
+    /// Set the waveform change handler
+    /// - Parameter handler: Closure with an array of floats as the argument
+    public func setWaveformUpdateHandler(_ handler: @escaping ([Float]) -> Void) {
+        waveformUpdateHandler = handler
+    }
 }

Sources/SoundpipeAudioKit/Generators/DynamicOscillator.swift

@@ -83,15 +83,15 @@ class DynamicOscillatorTests: XCTestCase {
         oscillator.start()
         let audio = engine.startTest(totalDuration: 1.0)
         audio.append(engine.render(duration: 0.5))
-        oscillator.setWaveTable(waveform: Table(.square))
+        oscillator.setWaveform(Table(.square))
         audio.append(engine.render(duration: 0.5))
         testMD5(audio)
     }
 
     func testGetWavetableValues() {
         let engine = AudioEngine()
         let oscillator = DynamicOscillator(waveform: Table(.square), frequency: 400)
-        let floats = oscillator.getWavetableValues()
+        let floats = oscillator.getWaveformValues()
         XCTAssertEqual(floats, Table(.square).content)
         engine.output = oscillator
         oscillator.start()
@@ -104,13 +104,13 @@ class DynamicOscillatorTests: XCTestCase {
         let engine = AudioEngine()
         var floats: [Float] = []
         let oscillator = DynamicOscillator(waveform: Table(.square), frequency: 400)
-        oscillator.wavetableUpdateHandler = { newFloats in
+        oscillator.setWaveformUpdateHandler { newFloats in
             floats = newFloats
         }
         engine.output = oscillator
         oscillator.start()
         let audio = engine.startTest(totalDuration: 1.0)
-        oscillator.setWaveTable(waveform: Table(.square))
+        oscillator.setWaveform(Table(.square))
         audio.append(engine.render(duration: 1.0))
         XCTAssertEqual(floats, Table(.square).content)
         testMD5(audio)