Merge branch 'main' of https://github.com/AudioKit/AudioKitEX

aure · aure · commit 58e0d4075e35 · 2023-01-15T11:24:13.000-08:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     uses: AudioKit/ci/.github/workflows/swift_test.yml@main
     with:
       scheme: AudioKitEX
-      platforms: iOS macOS
+      platforms: iOS macOS tvOS
       swift-versions: 5.5 5.6
 
   # Send notification to Discord on failure.
@@ -22,4 +22,4 @@ jobs:
     uses: AudioKit/ci/.github/workflows/send_notification.yml@main
     needs: [swift_test]
     if: ${{ failure() && github.ref == 'refs/heads/main' }}
-    secrets: inherit
+    secrets: inherit
diff --git a/README.md b/README.md
@@ -5,7 +5,8 @@
 
 [![Build Status](https://github.com/AudioKit/AudioKitEX/workflows/CI/badge.svg)](https://github.com/AudioKit/AudioKitEX/actions?query=workflow%3ACI)
 [![License](https://img.shields.io/github/license/AudioKit/AudioKitEX)](https://github.com/AudioKit/AudioKitEX/blob/main/LICENSE)
-[![Platform](https://img.shields.io/cocoapods/p/AudioKit)](https://github.com/AudioKit/AudioKit/)
+[![Swift Compatibility](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FAudioKit%2FAudioKit%2Fbadge%3Ftype%3Dswift-versions&label=)](https://swiftpackageindex.com/AudioKit/AudioKit)
+[![Platform Compatibility](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FAudioKit%2FAudioKit%2Fbadge%3Ftype%3Dplatforms&label=)](https://swiftpackageindex.com/AudioKit/AudioKit)
 [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 [![Twitter Follow](https://img.shields.io/twitter/follow/AudioKitPro.svg?style=social)](https://twitter.com/AudioKitPro)
 
diff --git a/Sources/AudioKitEX/Automation/NodeParameter+Automation.swift b/Sources/AudioKitEX/Automation/NodeParameter+Automation.swift
@@ -47,8 +47,8 @@ extension NodeParameter {
             
             guard let observer = ParameterAutomationGetRenderObserver(parameter.address,
                                                                       avAudioNode.auAudioUnit.scheduleParameterBlock,
-                                                                      Float(Settings.sampleRate),
-                                                                      Float(lastTime.sampleTime),
+                                                                      Double(Settings.sampleRate),
+                                                                      Double(lastTime.sampleTime),
                                                                       automationBaseAddress,
                                                                       events.count) else { return }
             
diff --git a/Sources/CAudioKitEX/Internals/AUParameterTreeExt.mm b/Sources/CAudioKitEX/Internals/AUParameterTreeExt.mm
diff --git a/Sources/CAudioKitEX/Sequencing/ParameterAutomation.mm b/Sources/CAudioKitEX/Sequencing/ParameterAutomation.mm
@@ -12,8 +12,8 @@
 extern "C"
 AURenderObserver ParameterAutomationGetRenderObserver(AUParameterAddress address,
                                                       AUScheduleParameterBlock scheduleParameterBlock,
-                                                      float sampleRate,
-                                                      float startSampleTime,
+                                                      double sampleRate,
+                                                      double startSampleTime,
                                                       const struct AutomationEvent* eventsArray,
                                                       size_t count) {
 
@@ -33,16 +33,18 @@ AURenderObserver ParameterAutomationGetRenderObserver(AUParameterAddress address
     {
         if (actionFlags != kAudioUnitRenderAction_PreRender) return;
 
-        float blockStartTime = (timestamp->mSampleTime - startSampleTime) / sampleRate;
-        float blockEndTime = blockStartTime + frameCount / sampleRate;
+        double blockStartSample = timestamp->mSampleTime - startSampleTime;
+        double blockEndSample = blockStartSample + frameCount;
 
         AUValue initial = NAN;
 
         // Skip over events completely in the past to determine
         // an initial value.
         for (; index < count; ++index) {
             auto event = events[index];
-            if ( !(event.startTime + event.rampDuration < blockStartTime) ) {
+            double eventStartSample = event.startTime * sampleRate;
+            double rampSampleDuration = event.rampDuration * sampleRate;
+            if ( !(eventStartSample + rampSampleDuration < blockStartSample) ) {
                 break;
             }
             initial = event.targetValue;
@@ -59,11 +61,12 @@ AURenderObserver ParameterAutomationGetRenderObserver(AUParameterAddress address
         // Apply parameter automation for the segment.
         while (index < count) {
             auto event = events[index];
+            double eventStartSample = event.startTime * sampleRate;
 
             // Is it after the current block?
-            if (event.startTime >= blockEndTime) break;
+            if (eventStartSample >= blockEndSample) break;
 
-            AUEventSampleTime startTime = (event.startTime - blockStartTime) * sampleRate;
+            AUEventSampleTime startTime = eventStartSample - blockStartSample;
             AUAudioFrameCount duration = event.rampDuration * sampleRate;
 
             // If the event has already started, ensure we hit the targetValue
diff --git a/Sources/CAudioKitEX/include/AUParameterTreeExt.h b/Sources/CAudioKitEX/include/AUParameterTreeExt.h
diff --git a/Sources/CAudioKitEX/include/CAudioKit.h b/Sources/CAudioKitEX/include/CAudioKit.h
@@ -17,7 +17,6 @@ FOUNDATION_EXPORT const unsigned char AudioKitVersionString[];
 #import "DSPBase.h"
 
 #import "ExceptionCatcher.h"
-#import "AUParameterTreeExt.h"
 
 // Testing
 #import "DebugDSP.h"
diff --git a/Sources/CAudioKitEX/include/ParameterAutomation.h b/Sources/CAudioKitEX/include/ParameterAutomation.h
@@ -26,8 +26,8 @@ struct AutomationEvent {
 /// Returns a render observer block which will apply the automation to the selected parameter.
 AURenderObserver ParameterAutomationGetRenderObserver(AUParameterAddress address,
                                                       AUScheduleParameterBlock scheduleParameterBlock,
-                                                      float sampleRate,
-                                                      float startSampleTime,
+                                                      double sampleRate,
+                                                      double startSampleTime,
                                                       const struct AutomationEvent* events,
                                                       size_t count);
 
diff --git a/Tests/AudioKitEXTests/ParameterAutomationTests.swift b/Tests/AudioKitEXTests/ParameterAutomationTests.swift
@@ -9,17 +9,17 @@ class ParameterAutomationTests: XCTestCase {
 
     func observerTest(events: [AutomationEvent],
                       sampleTime: Float64,
-                      startTime: Float = 0) -> ([AUParameterAddress], [AUValue], [AUAudioFrameCount]) {
+                      startTime: Double = 0) -> ([AUParameterAddress], [(AUValue, AUEventSampleTime)], [AUAudioFrameCount]) {
 
         let address = AUParameterAddress(42)
 
         var addresses: [AUParameterAddress] = []
-        var values: [AUValue] = []
+        var values: [(AUValue, AUEventSampleTime)] = []
         var durations: [AUAudioFrameCount] = []
 
         let scheduleParameterBlock: AUScheduleParameterBlock = { (sampleTime, rampDuration, address, value) in
             addresses.append(address)
-            values.append(value)
+            values.append((value, sampleTime))
             durations.append(rampDuration)
         }
 
@@ -42,13 +42,25 @@ class ParameterAutomationTests: XCTestCase {
 
     func testSimpleAutomation() throws {
 
-        let events = [ AutomationEvent(targetValue: 880, startTime: 0, rampDuration: 1.0) ]
+        let events = [AutomationEvent(targetValue: 880, startTime: 0, rampDuration: 0)]
 
         let (addresses, values, _) = observerTest(events: events, sampleTime: 0)
 
         // order is: taper, skew, offset, value
         XCTAssertEqual(addresses, [42])
-        XCTAssertEqual(values, [880.0])
+        XCTAssertEqual(values.map(\.0), [880.0])
+    }
+
+    func testSimpleAutomationWithBigValues() throws {
+
+        let events = [AutomationEvent(targetValue: 880, startTime: 0, rampDuration: 0)]
+
+        let (addresses, values, _) = observerTest(events: events, sampleTime: 1000000000, startTime: 1000000001)
+
+        // order is: taper, skew, offset, value
+        XCTAssertEqual(addresses, [42])
+        XCTAssertEqual(values.map(\.0), [880.0])
+        XCTAssertEqual(values.map(\.1), [1])
     }
 
     func testPastAutomation() {
@@ -59,7 +71,7 @@ class ParameterAutomationTests: XCTestCase {
 
         // If the automation is in the past, the value should be set to the final value.
         XCTAssertEqual(addresses, [42])
-        XCTAssertEqual(values, [880.0])
+        XCTAssertEqual(values.map(\.0), [880.0])
     }
 
     func testPastAutomationTwo() {
@@ -71,7 +83,7 @@ class ParameterAutomationTests: XCTestCase {
 
         // If the automation is in the past, the value should be set to the final value.
         XCTAssertEqual(addresses, [42])
-        XCTAssertEqual(values, [440.0])
+        XCTAssertEqual(values.map(\.0), [440.0])
 
     }
 
@@ -83,7 +95,7 @@ class ParameterAutomationTests: XCTestCase {
 
         // If the automation is in the future, we should not get anything.
         XCTAssertEqual(addresses, [])
-        XCTAssertEqual(values, [])
+        XCTAssertEqual(values.map(\.0), [])
     }
 
     func testAutomationMiddle() {
@@ -95,7 +107,7 @@ class ParameterAutomationTests: XCTestCase {
         let (addresses, values, durations) = observerTest(events: events, sampleTime: 128)
 
         XCTAssertEqual(addresses, [42])
-        XCTAssertEqual(values, [1.0])
+        XCTAssertEqual(values.map(\.0), [1.0])
         XCTAssertEqual(durations, [UInt32(44100-128)])
     }
 
diff --git a/Tests/AudioKitEXTests/SequencerEngineTests.swift b/Tests/AudioKitEXTests/SequencerEngineTests.swift
@@ -9,6 +9,13 @@ import AudioKitEX
 
 class SequencerEngineTests: XCTestCase {
 
+    /// Renders a four-beat loop and returns MIDI events.
+    ///
+    /// - Parameters:
+    ///   - sequence: sequence to be rendered
+    ///   - frameCount: frame count for each render call. Assuing 44100 frames/sec.
+    ///   - renderCallCount: number of render calls
+    /// - Returns: MIDI events generated by the sequencer engine
     func observerTest(sequence: NoteEventSequence,
                       frameCount: AUAudioFrameCount = 44100,
                       renderCallCount: Int = 1) -> [MIDIEvent] {
