feat(patina): Tone guard for bass lines
Patina detects the played note (30-500 Hz) and remembers, over about 4 s, how high each spectral bump is at a fixed frequency and relative to the note. Bumps that follow the note (a boosted harmonic the patch is built on) get less cut; bumps fixed in Hz (formants, room modes) are cut as before. On a saw line F1-F2 with harmonic 6 boosted, the cut on that harmonic drops from 5.78 dB to 0.44 dB at 100 %, while a fixed formant at 1.5 kHz stays at 5.78 dB. One held note is cut as normal, since the two cases cannot be told apart. - New parameter tone-guard (0-100 %, default 0), appended at the end; 0 % is the old behaviour and old settings load unchanged. - New Bass line preset. - Editor: Tone guard control, NOTE readout and a strip over the spectrum where cuts are held back. - No added latency, no allocation on the audio thread; patina-core now depends on common-dsp.
This commit is contained in:
1 parent
6d868a63c4
commit
53bc26d14d
15 files changed
+391
-10
No files matched your search
@@ -43,7 +43,9 @@ impl State {
|
||||
self.analyzer.envelope[i] += 0.45 * (frame.envelope[i] - self.analyzer.envelope[i]);
|
||||
self.analyzer.reference[i] += 0.45 * (frame.reference[i] - self.analyzer.reference[i]);
|
||||
self.analyzer.reduction[i] += 0.5 * (frame.reduction[i] - self.analyzer.reduction[i]);
|
||||
self.analyzer.tone[i] += 0.5 * (frame.tone[i] - self.analyzer.tone[i]);
|
||||
}
|
||||
self.analyzer.pitch = frame.pitch;
|
||||
self.analyzer.focus = frame.focus;
|
||||
self.analyzer.input_peak = frame.input_peak;
|
||||
self.analyzer.output_peak = frame.output_peak;
|
||||
@@ -59,6 +61,21 @@ impl State {
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Note name of a frequency, or a dash when there is none.
|
||||
fn note_name(hz: f32) -> String {
|
||||
if hz <= 0. {
|
||||
return "—".into();
|
||||
}
|
||||
const NAMES: [&str; 12] = [
|
||||
"C", "C#", "D", "D#", "E", "F", "F#", "G", "G#", "A", "A#", "B",
|
||||
];
|
||||
let n = (69. + 12. * (hz / 440.).log2()).round() as i32;
|
||||
format!(
|
||||
"{}{}",
|
||||
NAMES[n.rem_euclid(12) as usize],
|
||||
n.div_euclid(12) - 1
|
||||
)
|
||||
}
|
||||
fn db(x: f32) -> f32 {
|
||||
20. * x.max(1e-6).log10()
|
||||
}
|
||||
@@ -99,6 +116,7 @@ fn control(
|
||||
let defaults = Settings::default();
|
||||
*value = match name {
|
||||
"Transient guard" => defaults.transient_guard,
|
||||
"Tone guard" => defaults.tone_guard,
|
||||
"Attack" => defaults.attack,
|
||||
"Release" => defaults.release,
|
||||
"Low frequency" => defaults.low,
|
||||
@@ -170,7 +188,7 @@ pub fn show(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State) {
|
||||
ui.separator();
|
||||
egui::ComboBox::from_id_salt("resonance-preset")
|
||||
.selected_text(
|
||||
(0..4)
|
||||
(0..Settings::PRESETS.len())
|
||||
.find(|i| *settings == Settings::preset(*i))
|
||||
.map_or("Custom", |i| Settings::PRESETS[i]),
|
||||
)
|
||||
@@ -209,6 +227,9 @@ pub fn show(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State) {
|
||||
format!("{:>3.0} %", state.analyzer.guard * 100.),
|
||||
MUTED,
|
||||
);
|
||||
if settings.tone_guard > 0. {
|
||||
readout(ui, "NOTE", note_name(state.analyzer.pitch), FOCUS);
|
||||
}
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
caption(
|
||||
ui,
|
||||
@@ -368,9 +389,9 @@ pub fn show(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State) {
|
||||
panel(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
egui::Grid::new("engine-controls")
|
||||
.num_columns(3)
|
||||
.num_columns(4)
|
||||
.spacing([16., 12.])
|
||||
.min_col_width((ui.available_width() - 32.) / 3.)
|
||||
.min_col_width((ui.available_width() - 48.) / 4.)
|
||||
.show(ui, |ui| {
|
||||
control(
|
||||
ui,
|
||||
@@ -402,6 +423,16 @@ pub fn show(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State) {
|
||||
"Relaxes cuts on attacks to keep punch. Turn down to catch short rings.",
|
||||
state,
|
||||
);
|
||||
control(
|
||||
ui,
|
||||
"Tone guard",
|
||||
&mut settings.tone_guard,
|
||||
0. ..=100.,
|
||||
" %",
|
||||
false,
|
||||
"Keeps bumps that follow the played note (the harmonics a bass is built on) and still cuts rings fixed in Hz. Needs a few different notes to tell them apart.",
|
||||
state,
|
||||
);
|
||||
ui.end_row();
|
||||
});
|
||||
ui.add_space(6.);
|
||||
@@ -622,6 +653,23 @@ fn spectrum(ui: &mut egui::Ui, settings: &mut Settings, state: &mut State) {
|
||||
fill[1..=GRID].to_vec(),
|
||||
Stroke::new(1.6_f32, ACCENT),
|
||||
));
|
||||
// Tone guard: a strip along the top where cuts are held back because the bump follows the note.
|
||||
if settings.tone_guard > 0. {
|
||||
let mut strip = egui::Mesh::default();
|
||||
for i in 0..GRID {
|
||||
let xx = x(frequency(i));
|
||||
let alpha = (state.analyzer.tone[i].clamp(0., 1.) * 170.) as u8;
|
||||
let color = Color32::from_rgba_unmultiplied(FOCUS.r(), FOCUS.g(), FOCUS.b(), alpha);
|
||||
strip.colored_vertex(Pos2::new(xx, r.top()), color);
|
||||
strip.colored_vertex(Pos2::new(xx, r.top() + 8.), color);
|
||||
if i > 0 {
|
||||
let j = (i * 2) as u32;
|
||||
strip.add_triangle(j - 2, j - 1, j);
|
||||
strip.add_triangle(j - 1, j, j + 1);
|
||||
}
|
||||
}
|
||||
p.add(egui::Shape::mesh(strip));
|
||||
}
|
||||
let center = r.center().y;
|
||||
let focus_y = |offset: f32| center - offset / 36. * r.height() * 0.65;
|
||||
let points: Vec<_> = (0..GRID)
|
||||
|
||||
Reference in new issue
Block a user