Fixed the ability of playground oscillator and noise generator to stop

AudioKit · Dec 23, 2021 · 491ae3d · 491ae3d
1 parent ad000a2
commit 491ae3d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/Sources/AudioKit/Nodes/Generators/PlaygroundNoiseGenerator.swift b/Sources/AudioKit/Nodes/Generators/PlaygroundNoiseGenerator.swift
@@ -8,18 +8,17 @@ import CoreAudio // for UnsafeMutableAudioBufferListPointer
 public class PlaygroundNoiseGenerator: Node {
  fileprivate lazy var sourceNode = AVAudioSourceNode { [self] _, _, frameCount, audioBufferList in
  let ablPointer = UnsafeMutableAudioBufferListPointer(audioBufferList)
-
- if self.isStarted {
- for frame in 0..<Int(frameCount) {
- // Get signal value for this frame at time.
- let value = self.amplitude * Float.random(in: -1 ... 1)
-
- // Set the same value on all channels (due to the inputFormat we have only 1 channel though).
- for buffer in ablPointer {
- let buf: UnsafeMutableBufferPointer<Float> = UnsafeMutableBufferPointer(buffer)
- buf[frame] = value
- }
+
+ for frame in 0..<Int(frameCount) {
+ // Get signal value for this frame at time.
+ let value = self.amplitude * Float.random(in: -1 ... 1)
+
+ // Set the same value on all channels (due to the inputFormat we have only 1 channel though).
+ for buffer in ablPointer {
+ let buf: UnsafeMutableBufferPointer<Float> = UnsafeMutableBufferPointer(buffer)
+ buf[frame] = self.isStarted ? value : 0
  }
+
  }
  return noErr
  }

diff --git a/Sources/AudioKit/Nodes/Generators/PlaygroundOscillator.swift b/Sources/AudioKit/Nodes/Generators/PlaygroundOscillator.swift
@@ -11,22 +11,20 @@ public class PlaygroundOscillator: Node {
  fileprivate lazy var sourceNode = AVAudioSourceNode { [self] _, _, frameCount, audioBufferList in
  let ablPointer = UnsafeMutableAudioBufferListPointer(audioBufferList)
 
- if self.isStarted {
- let phaseIncrement = (twoPi / Float(Settings.sampleRate)) * self.frequency
- for frame in 0..<Int(frameCount) {
- // Get signal value for this frame at time.
- let index = Int(self.currentPhase / twoPi * Float(self.waveform!.count))
- let value = self.waveform![index] * self.amplitude
-
- // Advance the phase for the next frame.
- self.currentPhase += phaseIncrement
- if self.currentPhase >= twoPi { self.currentPhase -= twoPi }
- if self.currentPhase < 0.0 { self.currentPhase += twoPi }
- // Set the same value on all channels (due to the inputFormat we have only 1 channel though).
- for buffer in ablPointer {
- let buf: UnsafeMutableBufferPointer<Float> = UnsafeMutableBufferPointer(buffer)
- buf[frame] = value
- }
+ let phaseIncrement = (twoPi / Float(Settings.sampleRate)) * self.frequency
+ for frame in 0..<Int(frameCount) {
+ // Get signal value for this frame at time.
+ let index = Int(self.currentPhase / twoPi * Float(self.waveform!.count))
+ let value = self.waveform![index] * self.amplitude
+
+ // Advance the phase for the next frame.
+ self.currentPhase += phaseIncrement
+ if self.currentPhase >= twoPi { self.currentPhase -= twoPi }
+ if self.currentPhase < 0.0 { self.currentPhase += twoPi }
+ // Set the same value on all channels (due to the inputFormat we have only 1 channel though).
+ for buffer in ablPointer {
+ let buf: UnsafeMutableBufferPointer<Float> = UnsafeMutableBufferPointer(buffer)
+ buf[frame] = self.isStarted ? value : 0
  }
  }
  return noErr