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 #645 from Silvertree2010/fix/h1875-track-write-midi-rtp-ignores-the

Browse Source 
Shift controller events by Delay in track.write_midi_rtp
This commit is contained in:
Brandon Thomas
2026-10-19 02:54:37 -04:00
committed by GitHub
parent b96379e443 0dfb074820
commit 4e932785fe
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/engine/src/cmd/track_more.rs
+29
View File
@@ -383,6 +383,10 @@ fn write_rtp(e: &mut Engine, p: &Value) -> Result<Value> {
n.start = n.start.saturating_add(r.delay_ticks).max(0);
notes += 1;
}
// Playback delays controller events too, but ignores those before tick 0 (hidden by a start trim).
for c in sequence.ctrls.iter_mut().filter(|c| c.tick >= 0) {
c.tick = c.tick.saturating_add(r.delay_ticks).max(0);
}
sequence.sort();
}
let pre = format!("rtp.{}.", t.0);
@@ -635,6 +639,31 @@ mod tests {
assert!(!e.session().edit.values.keys().any(|k| k.starts_with(&format!("rtp.{}.", keys.0))));
}
#[test]
fn rtp_delay_shifts_controller_events() {
use soundcraft_midi::{CtrlEvent, CtrlKind};
let mut e = crate::demo::demo_engine();
let keys = e.session().track_by_name("Keys").unwrap().id;
let s = e.session_mut();
if let Some(pl) = s.track_mut(keys).and_then(Track::playlist_mut)
&& let ClipContent::Midi { sequence } = &mut pl.clips[0].content
{
sequence.ctrls.clear();
sequence.ctrls.push(CtrlEvent { tick: 100, channel: 0, kind: CtrlKind::Cc(7), value: 90 });
sequence.ctrls.push(CtrlEvent { tick: 200, channel: 0, kind: CtrlKind::PitchBend, value: 10 });
sequence.ctrls.push(CtrlEvent { tick: -30, channel: 0, kind: CtrlKind::Cc(1), value: 5 });
}
s.edit.values.insert(track_key("rtp", keys, "delay"), 50.0);
e.execute("edit.select", &json!({"tracks": [keys.0]})).unwrap();
e.execute("track.write_midi_rtp", &json!({})).unwrap();
let ClipContent::Midi { sequence } = &e.session().track(keys).unwrap().clips()[0].content else { panic!() };
let tick_of = |k: CtrlKind| sequence.ctrls.iter().find(|c| c.kind == k).map(|c| c.tick);
assert_eq!(tick_of(CtrlKind::Cc(7)), Some(150), "playback delayed the CC by 50 ticks; baked result must match");
assert_eq!(tick_of(CtrlKind::PitchBend), Some(250));
// Hidden by a start trim: playback ignores it, so baking leaves it alone.
assert_eq!(tick_of(CtrlKind::Cc(1)), Some(-30));
}
#[test]
fn trim_and_vca_coalesce() {
let mut e = Engine::default();