diff --git a/src/plugin.rs b/src/plugin.rs index a6bda3f..ebed182 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -973,34 +973,51 @@ unsafe fn generate_samples( changes: &mut [ParameterPoints<'_>; parameters::COUNT + 1], peak: &mut f32, ) -> u64 { + let automated = changes.iter().enumerate().fold(0_u64, |mask, (i, point)| { + mask | (u64::from(point.automated) << i) + }); // バッファの有無と精度は区間ごとに選び、サンプルループ内では分岐しない。 let nonzero = match channels { Some(channels) if data.symbolic_sample_size == SAMPLE32 => { - generate_output_samples(plugin, synth, changes, range.clone(), |offset, sample| { - let sample = sample.map(|value| value as f32); - *peak = (*peak).max(sample[0].abs()).max(sample[1].abs()); - for (channel, sample) in channels.into_iter().zip(sample) { - // SAFETY: 呼び出し元で検証済み。左右が同じ領域でも順に書き込む。 - unsafe { channel.cast::().add(offset).write(sample) }; - } - u64::from(sample[0] != 0.0) | (u64::from(sample[1] != 0.0) << 1) - }) + generate_output_samples( + plugin, + synth, + changes, + automated, + range.clone(), + |offset, sample| { + let sample = sample.map(|value| value as f32); + *peak = (*peak).max(sample[0].abs()).max(sample[1].abs()); + for (channel, sample) in channels.into_iter().zip(sample) { + // SAFETY: 呼び出し元で検証済み。左右が同じ領域でも順に書き込む。 + unsafe { channel.cast::().add(offset).write(sample) }; + } + u64::from(sample[0] != 0.0) | (u64::from(sample[1] != 0.0) << 1) + }, + ) } Some(channels) => { - generate_output_samples(plugin, synth, changes, range.clone(), |offset, sample| { - *peak = (*peak).max(sample[0].abs().max(sample[1].abs()) as f32); - for (channel, sample) in channels.into_iter().zip(sample) { - // SAFETY: 呼び出し元で検証済み。排他的sliceは作らない。 - unsafe { channel.cast::().add(offset).write(sample) }; - } - u64::from(sample[0] != 0.0) | (u64::from(sample[1] != 0.0) << 1) - }) + generate_output_samples( + plugin, + synth, + changes, + automated, + range.clone(), + |offset, sample| { + *peak = (*peak).max(sample[0].abs().max(sample[1].abs()) as f32); + for (channel, sample) in channels.into_iter().zip(sample) { + // SAFETY: 呼び出し元で検証済み。排他的sliceは作らない。 + unsafe { channel.cast::().add(offset).write(sample) }; + } + u64::from(sample[0] != 0.0) | (u64::from(sample[1] != 0.0) << 1) + }, + ) } - None => generate_output_samples(plugin, synth, changes, range.clone(), |_, _| 0), + None => generate_output_samples(plugin, synth, changes, automated, range.clone(), |_, _| 0), }; // ノートと同位置のパラメーターを先に適用。0サンプルフラッシュもここを通る。 if range.end < data.num_samples || data.num_samples == 0 { - apply_parameters(plugin, synth, changes, range.end); + apply_parameters(plugin, synth, changes, automated, range.end); } nonzero } @@ -1010,13 +1027,14 @@ fn generate_output_samples( plugin: &Plugin, synth: &mut Synthesizer, changes: &mut [ParameterPoints<'_>; parameters::COUNT + 1], + automated: u64, range: std::ops::Range, mut write: impl FnMut(usize, [f64; 2]) -> u64, ) -> u64 { let mut nonzero = 0; - if changes.iter().any(|change| change.automated) { + if automated != 0 { for offset in range { - apply_parameters(plugin, synth, changes, offset); + apply_parameters(plugin, synth, changes, automated, offset); nonzero |= write(offset as usize, synth.generate_sample()); } } else { @@ -1031,24 +1049,34 @@ fn apply_parameters( plugin: &Plugin, synth: &mut Synthesizer, changes: &mut [ParameterPoints<'_>; parameters::COUNT + 1], + automated: u64, offset: i32, ) { - let loaded = changes[parameters::PROGRAM_INDEX].take_program_at(offset); + let loaded = automated & (1 << parameters::PROGRAM_INDEX) != 0 + && changes[parameters::PROGRAM_INDEX].take_program_at(offset); + let mut values = synth.parameters(); if loaded { - let values = parameters::sine_preset(); + values = parameters::sine_preset(); for (change, value) in changes.iter_mut().zip(values) { change.reset_value(offset, value); } } - let values = std::array::from_fn(|i| changes[i].value_at(offset)); + let controls = automated & ((1_u64 << parameters::COUNT) - 1); + let mut pending = controls; + while pending != 0 { + let i = pending.trailing_zeros() as usize; + pending &= pending - 1; + values[i] = changes[i].value_at(offset); + } let changed = synth.set_parameters(values); if loaded { plugin.processor_parameters.store(values); } else if changed { - for (i, change) in changes[..parameters::COUNT].iter().enumerate() { - if change.automated { - plugin.processor_parameters.set(i, values[i]); - } + let mut pending = controls; + while pending != 0 { + let i = pending.trailing_zeros() as usize; + pending &= pending - 1; + plugin.processor_parameters.set(i, values[i]); } } } diff --git a/src/synth.rs b/src/synth.rs index dac189e..b32d25b 100644 --- a/src/synth.rs +++ b/src/synth.rs @@ -70,6 +70,10 @@ impl Synthesizer { self.state.sample_rate = sample_rate; } + pub fn parameters(&self) -> [f64; parameters::COUNT] { + self.state.parameters + } + /// 設定は全枠の入力に反映し、発振器の内部状態はイベント処理から変更しない。 pub fn set_parameters(&mut self, values: [f64; parameters::COUNT]) -> bool { if values == self.state.parameters {