Merge pull request #514 from MarekSpodBiedry/issue-453

Scale fades, sync point and gain envelope when importing a clip group at another sample rate (#453)
This commit is contained in:
Brandon Thomas authored and GitHub committed 2026-10-19 03:03:11 -04:00
commit ef00e8322c
1 file changed
+26
+26
View File
@@ -160,6 +160,10 @@ pub fn import(e: &mut Engine, path: &str, first: Option<TrackId>, at: Samples) -
c.id = s.new_clip_id();
c.start = at.saturating_add(scale(c.start.max(0)));
c.length = scale(c.length);
c.fade_in.len = scale(c.fade_in.len);
c.fade_out.len = scale(c.fade_out.len);
c.sync_point = scale(c.sync_point);
c.gain_env.iter_mut().for_each(|(at, _)| *at = scale(*at));
c.group = Some(group_id);
c.sanitize();
placed.push(c.id);
@@ -229,6 +233,28 @@ mod tests {
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn fades_sync_point_and_envelope_follow_the_sample_rate() {
let dir = std::env::temp_dir().join(format!("sc-grp-rate-{}", std::process::id()));
let _ = std::fs::create_dir_all(&dir);
let p = dir.join("rate.scgrp");
let mut e = crate::demo::demo_engine();
// The file was saved at half the session rate, so every position doubles.
let src_rate = e.session().sample_rate.hz() / 2;
let fade = |len: i64| json!({"len": len, "shape": "Linear"});
let clip = json!({
"id": 1, "name": "m", "start": 0, "length": 10_000, "content": {"Midi": {"sequence": {"notes": [], "ctrls": []}}},
"fade_in": fade(1000), "fade_out": fade(2000), "sync_point": 500, "gain_env": [[100, -6.0], [4000, 0.0]]
});
let file = json!({"format": "soundcraft.clipgroup", "version": 1, "sample_rate": src_rate, "length": 10_000, "lanes": [[clip]], "audio": {}});
std::fs::write(&p, file.to_string()).unwrap();
let r = e.execute("file.import_clip_groups", &json!({"path": p.to_string_lossy()})).unwrap();
let c = e.session().find_clip(soundcraft_model::ClipId(r["clips"][0].as_u64().unwrap())).unwrap().1;
assert_eq!((c.length, c.fade_in.len, c.fade_out.len, c.sync_point), (20_000, 2000, 4000, 1000));
assert_eq!(c.gain_env.iter().map(|&(at, _)| at).collect::<Vec<_>>(), vec![200, 8000]);
let _ = std::fs::remove_dir_all(&dir);
}
#[test]
fn a_file_named_by_many_ids_becomes_one_source() {
let dir = std::env::temp_dir().join(format!("sc-grp-shared-{}", std::process::id()));