Added key to pitchcorrect

Author: aure

Sources/CSoundpipeAudioKit/Effects/PitchCorrectDSP.mm

@@ -44,9 +44,6 @@ void init(int channelCount, double sampleRate) override {
         pitchcorrect_create(&pitchcorrect_r);
         pitchcorrect_init(sp, pitchcorrect_r);
 
-        // Default chromatic scale from A1 (55Hz) to A6 (1760Hz)
-        float defaultScale[1] = {440.00};
-        setWavetable(defaultScale, 1, 0);
     }
 
     void deinit() override {
@@ -82,6 +79,7 @@ void process(FrameRange range) override {
             pitchcorrect_set_scale_freqs(pitchcorrect_l, scale, scaleCount);
             pitchcorrect_set_scale_freqs(pitchcorrect_r, scale, scaleCount);
 
+
             pitchcorrect_set_speed(pitchcorrect_l, speed);
             pitchcorrect_set_amount(pitchcorrect_l, amount);
 
@@ -103,4 +101,3 @@ void process(FrameRange range) override {
 AK_REGISTER_DSP(PitchCorrectDSP, "pcrt")
 AK_REGISTER_PARAMETER(PitchCorrectParameterSpeed)
 AK_REGISTER_PARAMETER(PitchCorrectParameterAmount)
-

Sources/SoundpipeAudioKit/Effects/PitchCorrect.swift

@@ -10,7 +10,11 @@ import Tonic
 public class PitchCorrect: Node {
     let input: Node
 
-    var key: Key
+    public var key: Key {
+        didSet {
+            updateScaleFrequencies()
+        }
+    }
 
     /// Connected nodes
     public var connections: [Node] { [input] }
@@ -84,24 +88,20 @@ public class PitchCorrect: Node {
         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))
+                frequencies.append(UInt8(noteWithOctave.pitch.midiNoteNumber).midiNoteToFrequency())
             }
         }
 
         // Sort frequencies in ascending order
         frequencies.sort()
-        print(frequencies)
-        print(frequencies.count)
 
         // Set the frequencies in the DSP
-        au.setWavetable(frequencies)
+        setScaleFrequencies(frequencies)
     }
-
-}
-
-extension Pitch {
-    var frequency: Double {
-        return Double(UInt8(midiNoteNumber).midiNoteToFrequency())
+    
+    /// Set the scale frequencies for pitch correction
+    /// - Parameter frequencies: Array of frequencies in Hz
+    public func setScaleFrequencies(_ frequencies: [Float]) {
+        au.setWavetable(frequencies)
     }
 }

Tests/SoundpipeAudioKitTests/Effects Tests/PitchCorrectTests.swift

@@ -27,15 +27,9 @@ 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()
     }
 }

Tests/SoundpipeAudioKitTests/ValidatedMD5s.swift

@@ -54,5 +54,5 @@ let validatedMD5s: [String: String] = [
     "-[VocoderTests testVocoder]": "3836def448fed8ac901b179e943e6922",
     "-[VibratoTests testVibrato]": "4bad4a6d951683cf6745a79b96b6aae2",
     "-[VibratoTests testParameterSweep]": "cc3613847ed31d6566bbd4f6907e26e5",
-    "-[PitchCorrectTests testPitchCorrect]": "7585bf87d60d73a700da0921cbc72981"
+    "-[PitchCorrectTests testPitchCorrect]": "9128a5a1eb68d491af693028fcbc9668"
 ]