Added Tonic to dependencies to do some music theory stuff in pitch correction

Author: aure

Package.swift

@@ -11,6 +11,7 @@ let package = Package(
         .package(url: "https://github.com/AudioKit/KissFFT", from: "1.0.0"),
         .package(url: "https://github.com/AudioKit/AudioKit", from: "5.6.0"),
         .package(url: "https://github.com/AudioKit/AudioKitEX", from: "5.5.0"),
+        .package(url: "https://github.com/AudioKit/Tonic", from: "2.0.0"),
     ],
     targets: [
         .target(name: "Soundpipe",
@@ -22,9 +23,9 @@ let package = Package(
                     .headerSearchPath("modules"),
                     .headerSearchPath("external"),
                 ]),
-        .target(name: "SoundpipeAudioKit", dependencies: ["AudioKit", "AudioKitEX", "CSoundpipeAudioKit"]),
+        .target(name: "SoundpipeAudioKit", dependencies: ["AudioKit", "AudioKitEX", "CSoundpipeAudioKit", "Tonic"]),
         .target(name: "CSoundpipeAudioKit", dependencies: ["AudioKit", "AudioKitEX", "Soundpipe"]),
-        .testTarget(name: "SoundpipeAudioKitTests", dependencies: ["SoundpipeAudioKit"], resources: [.copy("TestResources/")]),
+        .testTarget(name: "SoundpipeAudioKitTests", dependencies: ["SoundpipeAudioKit", "Tonic"], resources: [.copy("TestResources/")]),
         .testTarget(name: "CSoundpipeAudioKitTests", dependencies: ["CSoundpipeAudioKit"]),
     ],
     cxxLanguageStandard: .cxx14

Sources/CSoundpipeAudioKit/Effects/PitchCorrectDSP.mm

@@ -45,15 +45,8 @@ void init(int channelCount, double sampleRate) override {
         pitchcorrect_init(sp, pitchcorrect_r);
 
         // Default chromatic scale from A1 (55Hz) to A6 (1760Hz)
-        float defaultScale[73] = {
-            55.00,   58.27,   61.74,   65.41,   69.30,   73.42,   77.78,   82.41,   87.31,   92.50,   98.00,   103.83,  // A1 to G#2
-            110.00,  116.54,  123.47,  130.81,  138.59,  146.83,  155.56,  164.81,  174.61,  185.00,  196.00,  207.65,  // A2 to G#3
-            220.00,  233.08,  246.94,  261.63,  277.18,  293.66,  311.13,  329.63,  349.23,  369.99,  392.00,  415.30,  // A3 to G#4
-            440.00,  466.16,  493.88,  523.25,  554.37,  587.33,  622.25,  659.26,  698.46,  739.99,  783.99,  830.61,  // A4 to G#5
-            880.00,  932.33,  987.77,  1046.50, 1108.73, 1174.66, 1244.51, 1318.51, 1396.91, 1479.98, 1567.98, 1661.22, // A5 to G#6
-            1760.00                                                                                                       // A6
-        };
-        setWavetable(defaultScale, 73, 0);
+        float defaultScale[1] = {440.00};
+        setWavetable(defaultScale, 1, 0);
     }
 
     void deinit() override {

Sources/SoundpipeAudioKit/Effects/PitchCorrect.swift

@@ -4,11 +4,14 @@ import AudioKit
 import AudioKitEX
 import AVFoundation
 import CAudioKitEX
+import Tonic
 
 /// Pitch correction
 public class PitchCorrect: Node {
     let input: Node
-
+    
+    var key: Key
+    
     /// Connected nodes
     public var connections: [Node] { [input] }
 
@@ -49,25 +52,56 @@ public class PitchCorrect: Node {
     ///
     /// - Parameters:
     ///   - input: Input node to process
+    ///   - key: Key to tune to
+    ///   - scale: Scale to use (default: major)
     ///   - speed: Speed of pitch correction (0-1)
     ///   - amount: Amount of pitch correction (0-1)
     ///
     public init(
         _ input: Node,
+        key: Key = .C,
         speed: AUValue = speedDef.defaultValue,
         amount: AUValue = amountDef.defaultValue
     ) {
         self.input = input
-
+        self.key = key
+        
+        updateScaleFrequencies()
+        
         setupParameters()
 
         self.speed = speed
         self.amount = amount
+        
+        updateScaleFrequencies()
     }
 
-    /// Set the scale frequencies for pitch correction
-    /// - Parameter frequencies: Array of frequencies in Hz
-    public func setScaleFrequencies(_ frequencies: [Float]) {
+    /// Update the scale frequencies based on current key and scale
+    private func updateScaleFrequencies() {
+        var frequencies: [Float] = []
+        
+        // Generate notes for octaves 0 through 7
+        for octave in 0...7 {
+            for noteClass in key.noteSet.noteClassSet.array {
+                let noteWithOctave = Note(noteClass.letter, accidental: noteClass.accidental, octave: octave)
+                print(noteClass)
+                frequencies.append(Float(noteWithOctave.pitch.frequency))
+            }
+        }
+        
+        // Sort frequencies in ascending order
+        frequencies.sort()
+        print(frequencies)
+        print(frequencies.count)
+        
+        // Set the frequencies in the DSP
         au.setWavetable(frequencies)
     }
+
+}
+
+extension Pitch {
+    var frequency: Double {
+        return Double(UInt8(midiNoteNumber).midiNoteToFrequency())
+    }
 }

Tests/SoundpipeAudioKitTests/Effects Tests/PitchCorrectTests.swift

@@ -4,6 +4,7 @@ import AudioKit
 import SoundpipeAudioKit
 import XCTest
 import AVFoundation
+import Tonic
 
 class PitchCorrectTests: XCTestCase {
     func testPitchCorrect() {
@@ -15,7 +16,7 @@ class PitchCorrectTests: XCTestCase {
         oscillator.amplitude = 0.5
 
         // Create pitch correction
-        let pitchCorrect = PitchCorrect(oscillator, speed: 1.0, amount: 1.0)
+        let pitchCorrect = PitchCorrect(oscillator, key: .A, speed: 1.0, amount: 1.0)
 
         engine.output = pitchCorrect
 
@@ -27,8 +28,14 @@ class PitchCorrectTests: XCTestCase {
         // Ramp frequency from 110 to 880 over 10 seconds
         oscillator.$frequency.ramp(to: 440, duration: 5.0)
 
+//        pitchCorrect.setScaleFrequencies([220,245,350,395])
+//        pitchCorrect.setValidNotes(root: .C, scale: .major)
+//        pitchCorrect.setValidNotes(.C, .Dsharp, .E)
+
+        
         audio.append(engine.render(duration: 5.0))
 
         testMD5(audio)
+        audio.audition()
     }
 }