diff --git a/src/eq.rs b/src/eq.rs index 52d888f..f12dc51 100644 --- a/src/eq.rs +++ b/src/eq.rs @@ -66,6 +66,10 @@ impl Eq { self.state.parameters.enabled } + pub fn parameters(&self) -> EqParameters { + self.state.parameters + } + pub fn set_parameters(&mut self, parameters: EqParameters) { let old = self.state.parameters; self.state.parameters = parameters; diff --git a/src/parameters.rs b/src/parameters.rs index a6b917a..b6be523 100644 --- a/src/parameters.rs +++ b/src/parameters.rs @@ -90,6 +90,21 @@ pub fn control_kind(index: usize) -> usize { } } +/// 32値までを並列比較し、変更を見つけたグループ以降の走査を省く。 +#[inline] +pub fn unchanged(values: &[f64], previous: &[f64]) -> bool { + values.len() == previous.len() + && values + .chunks(32) + .zip(previous.chunks(32)) + .all(|(values, previous)| { + values + .iter() + .zip(previous) + .fold(true, |equal, (value, old)| equal & (value == old)) + }) +} + /// 隣接スロットの種類と全設定を交換する。ホストのIDは移動しない。 pub fn swap_effects(values: &mut [f64; COUNT], first: usize) { for (a, b) in EFFECT_SLOTS[first].into_iter().zip(EFFECT_SLOTS[first + 1]) { @@ -1347,6 +1362,25 @@ pub unsafe fn write_state(stream: This, values: [f64; COUNT]) -> TResult { mod tests { use super::*; + #[test] + fn group_comparison_preserves_float_equality() { + let a = [0.0; COUNT]; + let mut b = a; + for length in 0..=COUNT { + assert!(unchanged(&a[..length], &b[..length])); + if length > 0 { + for value in [0.5, f64::INFINITY, f64::NAN] { + b[length - 1] = value; + assert!(!unchanged(&a[..length], &b[..length])); + } + b[length - 1] = -0.0; + assert!(unchanged(&a[..length], &b[..length])); + b[length - 1] = 0.0; + assert!(!unchanged(&a[..length], &b[..length - 1])); + } + } + } + #[test] fn knob_values_increase_and_round_trip_with_exact_defaults() { for (index, value) in defaults().into_iter().enumerate() { diff --git a/src/synth.rs b/src/synth.rs index fe9d57a..aaf492a 100644 --- a/src/synth.rs +++ b/src/synth.rs @@ -116,29 +116,46 @@ impl Synthesizer { /// 設定は有効な枠の入力へ反映し、Polyphony増加時は追加した枠も同期する。 pub fn set_parameters(&mut self, values: [f64; parameters::COUNT]) -> bool { - if values == self.state.parameters { + if parameters::unchanged(&values, &self.state.parameters) { return false; } if values[13] != self.state.parameters[13] { self.state.master_gain = 10.0_f64.powf(parameters::to_plain(13, values[13]) / 20.0); // 全体の音量だけが変わる場合は、各Voiceへの設定配送を省く。 - if values[..13] == self.state.parameters[..13] - && values[14..] == self.state.parameters[14..] + if parameters::unchanged(&values[..13], &self.state.parameters[..13]) + && parameters::unchanged(&values[14..], &self.state.parameters[14..]) { self.state.parameters = values; return true; } } - if values[34..42] != self.state.parameters[34..42] { - self.state.eq.set_parameters(parameters::eq(&values)); + if !parameters::unchanged(&values[34..42], &self.state.parameters[34..42]) { + let mut eq = self.state.eq.parameters(); + eq.enabled = values[34] >= 0.5; + for (indices, fields) in [ + ([35, 37, 40], &mut eq.frequencies_hz), + ([36, 38, 41], &mut eq.gains_db), + ] { + for (i, field) in indices.into_iter().zip(fields) { + if values[i] != self.state.parameters[i] { + *field = parameters::to_plain(i, values[i]); + } + } + } + if values[39] != self.state.parameters[39] { + eq.mid_q = parameters::to_plain(39, values[39]); + } + self.state.eq.set_parameters(eq); } self.state.limiter.set_enabled(values[108] >= 0.5); let previous = &self.state.parameters; // 有効範囲が広がるときは、休止していた枠へ現在の全設定を配送する。 let expanded = values[8] > previous[8]; - let oscillator_changed = - expanded || values[..8] != previous[..8] || values[12] != previous[12]; - let envelope_changed = expanded || values[14..20] != previous[14..20]; + let oscillator_changed = expanded + || !parameters::unchanged(&values[..8], &previous[..8]) + || values[12] != previous[12]; + let envelope_changed = + expanded || !parameters::unchanged(&values[14..20], &previous[14..20]); if values[8] != previous[8] { let count = parameters::to_plain(8, values[8]) as usize; for voice in &mut self.state.voices[count..self.state.polyphony.max(count)] { @@ -168,7 +185,7 @@ impl Synthesizer { voice.set_pitch_ratio(ratio); } } - if expanded || values[130..132] != previous[130..132] { + if expanded || !parameters::unchanged(&values[130..132], &previous[130..132]) { for voice in &mut self.state.voices[..self.state.polyphony] { voice.set_velocity_sensitivity([values[130], values[131]]); } @@ -253,12 +270,12 @@ impl Synthesizer { } } } - if expanded || values[29..31] != previous[29..31] { + if expanded || !parameters::unchanged(&values[29..31], &previous[29..31]) { for voice in &mut self.state.voices[..self.state.polyphony] { voice.set_phase_modulation([values[29] * 2.0, values[30] * 2.0]); } } - if values[20..22] != previous[20..22] + if !parameters::unchanged(&values[20..22], &previous[20..22]) || values[6] != previous[6] || (values[7] == 0.0) != (previous[7] == 0.0) { @@ -283,10 +300,12 @@ impl Synthesizer { ); } } - if values[31..34] != previous[31..34] || values[42..130] != previous[42..130] { + if !parameters::unchanged(&values[31..34], &previous[31..34]) + || !parameters::unchanged(&values[42..130], &previous[42..130]) + { self.state.effects.set_parameters(&values, previous); } - if expanded || values[9..11] != previous[9..11] { + if expanded || !parameters::unchanged(&values[9..11], &previous[9..11]) { let filter_type = parameters::FILTER_TYPES[parameters::to_plain(9, values[9]) as usize]; let cutoff_cents = parameters::to_plain(10, values[10]); let resonance_q = parameters::to_plain(11, values[11]);