diff --git a/src/effects.rs b/src/effects.rs index ea424f7..695f2ed 100644 --- a/src/effects.rs +++ b/src/effects.rs @@ -306,45 +306,11 @@ impl Effects { values: &[f64; parameters::COUNT], previous: &[f64; parameters::COUNT], ) { - for (slot, indices) in EFFECT_SLOTS.into_iter().enumerate() { - if indices.into_iter().any(|i| values[i] != previous[i]) { - if indices[8..12].iter().any(|&i| values[i] != previous[i]) { - self.state.slots[slot] - .state - .reverb - .set_parameters(parameters::reverb(values, slot)); - } - if indices[12..18].iter().any(|&i| values[i] != previous[i]) { - self.state.slots[slot] - .state - .chorus - .set_parameters(parameters::chorus(values, slot)); - } - if indices[18..23].iter().any(|&i| values[i] != previous[i]) { - self.state.slots[slot] - .state - .phaser - .set_parameters(parameters::phaser(values, slot)); - } - if indices[23..].iter().any(|&i| values[i] != previous[i]) { - self.state.slots[slot] - .state - .compressor - .set_parameters(parameters::compressor(values, slot)); - } - // 他のエフェクト設定変更でDistortionのGain換算をやり直さない。 - let distortion = if indices[1..4].iter().any(|&i| values[i] != previous[i]) { - parameters::distortion(values, slot) - } else { - self.state.slots[slot].state.parameters - }; - self.state.slots[slot].set_parameters( - parameters::EFFECT_TYPES - [parameters::to_plain(indices[0], values[indices[0]]) as usize], - distortion, - parameters::delay(values, slot), - ); - } + let changed = self.set_slot_parameters::<0>(values, previous) + | self.set_slot_parameters::<1>(values, previous) + | self.set_slot_parameters::<2>(values, previous); + if !changed { + return; } let padding = self .state @@ -358,6 +324,74 @@ impl Effects { } } + fn set_slot_parameters( + &mut self, + values: &[f64; parameters::COUNT], + previous: &[f64; parameters::COUNT], + ) -> bool { + let indices = &EFFECT_SLOTS[SLOT]; + let changed = |first, last| { + values[first..=last] + .iter() + .zip(&previous[first..=last]) + .fold(false, |changed, (a, b)| changed | (a != b)) + }; + let kind_changed = values[indices[0]] != previous[indices[0]]; + let distortion_changed = changed(indices[1], indices[3]); + let delay_changed = + changed(indices[4], indices[6]) | (values[indices[7]] != previous[indices[7]]); + let reverb_changed = changed(indices[8], indices[11]); + let chorus_changed = changed(indices[12], indices[17]); + let phaser_changed = changed(indices[18], indices[22]); + let compressor_changed = changed(indices[23], indices[29]); + if kind_changed + | distortion_changed + | delay_changed + | reverb_changed + | chorus_changed + | phaser_changed + | compressor_changed + { + if reverb_changed { + self.state.slots[SLOT] + .state + .reverb + .set_parameters(parameters::reverb(values, SLOT)); + } + if chorus_changed { + self.state.slots[SLOT] + .state + .chorus + .set_parameters(parameters::chorus(values, SLOT)); + } + if phaser_changed { + self.state.slots[SLOT] + .state + .phaser + .set_parameters(parameters::phaser(values, SLOT)); + } + if compressor_changed { + self.state.slots[SLOT] + .state + .compressor + .set_parameters(parameters::compressor(values, SLOT)); + } + // 他のエフェクト設定変更でDistortionのGain換算をやり直さない。 + let distortion = if distortion_changed { + parameters::distortion(values, SLOT) + } else { + self.state.slots[SLOT].state.parameters + }; + self.state.slots[SLOT].set_parameters( + parameters::EFFECT_TYPES + [parameters::to_plain(indices[0], values[indices[0]]) as usize], + distortion, + parameters::delay(values, SLOT), + ); + } + kind_changed + } + pub fn reset(&mut self) { for slot in &mut self.state.slots { slot.reset();