alex/nih-plug
1
0
Fork 0
Code Activity

Smooth the gain expression in Buffr Glitch

Browse source
This commit is contained in:
Robbert van der Helm 2023-01-17 02:27:59 +01:00
parent dd6a998977
commit 98e2e11d25
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
plugins/buffr_glitch/src/lib.rs
View file

@ -48,8 +48,8 @@ struct Voice {
/// The gain scaling from the velocity. If velocity sensitive mode is enabled, then this is the `[0, 1]` velocity /// The gain scaling from the velocity. If velocity sensitive mode is enabled, then this is the `[0, 1]` velocity
/// devided by `100/127` such that MIDI velocity 100 corresponds to 1.0 gain. /// devided by `100/127` such that MIDI velocity 100 corresponds to 1.0 gain.
velocity_gain: f32, velocity_gain: f32,
/// The gain from the gain note expression. This is not smoothed right now. /// The gain from the gain note expression.
gain_expression_gain: f32, gain_expression_gain: Smoother<f32>,
/// The envelope genrator used during playback. Produces a `[0, 1]` result. /// The envelope genrator used during playback. Produces a `[0, 1]` result.
amp_envelope: envelope::AREnvelope, amp_envelope: envelope::AREnvelope,
} }
@ -102,7 +102,8 @@ impl Default for Voice {
midi_note_id: None, midi_note_id: None,
velocity_gain: 1.0, velocity_gain: 1.0,
gain_expression_gain: 1.0, // This is initialized in `initialize()` since this relies on the sample rate
gain_expression_gain: Smoother::new(SmoothingStyle::Linear(5.0)),
amp_envelope: envelope::AREnvelope::default(), amp_envelope: envelope::AREnvelope::default(),
} }
} }
@ -215,9 +216,7 @@ impl Plugin for BuffrGlitch {
fn reset(&mut self) { fn reset(&mut self) {
for voice in &mut self.voices { for voice in &mut self.voices {
voice.buffer.reset(); voice.reset();
voice.midi_note_id = None;
voice.amp_envelope.reset();
} }
} }
@ -256,7 +255,9 @@ impl Plugin for BuffrGlitch {
NoteEvent::PolyVolume { note, gain, .. } => { NoteEvent::PolyVolume { note, gain, .. } => {
for voice in &mut self.voices { for voice in &mut self.voices {
if voice.midi_note_id == Some(note) { if voice.midi_note_id == Some(note) {
voice.gain_expression_gain = gain; voice
.gain_expression_gain
.set_target(self.sample_rate, gain);
break; break;
} }
} }
@ -300,12 +301,16 @@ impl Plugin for BuffrGlitch {
voice voice
.amp_envelope .amp_envelope
.next_block(&mut voice_amp_envelope, block_len); .next_block(&mut voice_amp_envelope, block_len);
let mut voice_gain_expression_gain = [0.0; MAX_BLOCK_SIZE];
voice
.gain_expression_gain
.next_block(&mut voice_gain_expression_gain, block_len);
for (value_idx, sample_idx) in (block_start..block_end).enumerate() { for (value_idx, sample_idx) in (block_start..block_end).enumerate() {
max_voice_amp_envelope[value_idx] = max_voice_amp_envelope[value_idx] =
max_voice_amp_envelope[value_idx].max(voice_amp_envelope[value_idx]); max_voice_amp_envelope[value_idx].max(voice_amp_envelope[value_idx]);
let amp = voice.velocity_gain let amp = voice.velocity_gain
* voice.gain_expression_gain * voice_gain_expression_gain[value_idx]
* voice_amp_envelope[value_idx]; * voice_amp_envelope[value_idx];
// This will start recording on the first iteration, and then loop the recorded // This will start recording on the first iteration, and then loop the recorded
@ -361,6 +366,12 @@ impl BuffrGlitch {
} }
impl Voice { impl Voice {
pub fn reset(&mut self) {
self.buffer.reset();
self.midi_note_id = None;
self.amp_envelope.reset();
}
/// Prepare playback on ntoe on. /// Prepare playback on ntoe on.
pub fn note_on(&mut self, params: &BuffrGlitchParams, midi_note_id: u8, velocity: f32) { pub fn note_on(&mut self, params: &BuffrGlitchParams, midi_note_id: u8, velocity: f32) {
self.midi_note_id = Some(midi_note_id); self.midi_note_id = Some(midi_note_id);
@ -369,7 +380,7 @@ impl Voice {
} else { } else {
1.0 1.0
}; };
self.gain_expression_gain = 1.0; self.gain_expression_gain.reset(1.0);
self.amp_envelope.reset(); self.amp_envelope.reset();
// We'll copy audio to the playback buffer to match the pitch of the note // We'll copy audio to the playback buffer to match the pitch of the note