aleleba/soundcraft
1
0
Fork 0
mirror of https://github.com/storytold/soundcraft.git synced 2026-10-24 10:36:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #940 from Silvertree2010/fix/h1335-automation-id-panics-with-intege

Browse Source 
Fix automation_id overflow and bad ids for high send/plugin slots
This commit is contained in:
Brandon Thomas
2026-10-24 01:01:17 -04:00
committed by GitHub
parent a0f78c0a1f a966917c76
commit 0a1b1b185d
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/edit_window.rs
+20 -4
View File
@@ -2546,13 +2546,18 @@ fn automation_id(p: &AutoParam) -> String {
AutoParam::Pan(0) => "pan".into(),
AutoParam::Pan(_) => "pan2".into(),
AutoParam::Mute => "mute".into(),
AutoParam::SendLevel(i) => format!("send_{}_level", (b'a' + i) as char),
AutoParam::SendPan(i) => format!("send_{}_pan", (b'a' + i) as char),
AutoParam::SendMute(i) => format!("send_{}_mute", (b'a' + i) as char),
AutoParam::Plugin { slot, param } => format!("plugin:{}:{param}", (b'a' + slot) as char),
AutoParam::SendLevel(i) => format!("send_{}_level", slot_id(*i)),
AutoParam::SendPan(i) => format!("send_{}_pan", slot_id(*i)),
AutoParam::SendMute(i) => format!("send_{}_mute", slot_id(*i)),
AutoParam::Plugin { slot, param } => format!("plugin:{}:{param}", slot_id(*slot)),
}
}
/// A slot as `AutoParam::parse` reads it: a letter for 0..=25, the number beyond that.
fn slot_id(i: u8) -> String {
if i < 26 { char::from(b'a' + i).to_string() } else { i.to_string() }
}
/// Grid snapping while dragging; holding Cmd/Ctrl swaps Grid and Slip.
fn drag_snap(s: &Session, at: Samples, flip: bool) -> Samples {
if s.edit.edit_mode.is_grid() != flip { s.edit.grid.snap(at, s.sample_rate, &s.tempo, s.frame_rate) } else { at }
@@ -2910,6 +2915,17 @@ mod tests {
use super::*;
use egui_kittest::Harness;
#[test]
fn automation_id_round_trips_for_high_slots() {
for slot in [0u8, 25, 26, 155, 156, 255] {
for p in
[AutoParam::SendLevel(slot), AutoParam::SendPan(slot), AutoParam::SendMute(slot), AutoParam::Plugin { slot, param: "trim".into() }]
{
assert_eq!(AutoParam::parse(&automation_id(&p)), Some(p));
}
}
}
#[test]
fn follow_jumps_to_offscreen_playhead_while_playing() {
// Steady view, follow mode, playhead left the screen: jump to it.