mirror of
https://github.com/storytold/soundcraft.git
synced 2026-11-20 17:14:57 +00:00
Export MIDI controllers and honour the tracks filter.
file.export_midi copied notes only, so controller, pressure, and pitch-bend events were dropped, and the tracks parameter was ignored. The file now includes those events, and a tracks list limits the export. Naming only non-MIDI tracks is an error instead of exporting every other MIDI track.
This commit is contained in:
2 files changed
+70
-5
No files matched your search
@@ -98,7 +98,8 @@ pub fn specs() -> Vec<CommandSpec> {
|
||||
}),
|
||||
cmd!(noundo "file.export_midi", "MIDI...", ["File", "Export"], None, "{path, tracks?}", always, |e, p| {
|
||||
let path = str_param(p, "path").ok_or_else(|| bad("file.export_midi", "`path` required"))?.to_string();
|
||||
let bytes = crate::io::export_midi(e)?;
|
||||
let only = if p.get("tracks").is_some() || p.get("track").is_some() { Some(tracks_param(e, "file.export_midi", p)?) } else { None };
|
||||
let bytes = crate::io::export_midi(e, only.as_deref())?;
|
||||
std::fs::write(&path, &bytes).map_err(|err| EngineError::Io(format!("{path}: {err}")))?;
|
||||
Ok(json!({"path": path, "bytes": bytes.len()}))
|
||||
}),
|
||||
@@ -426,6 +427,61 @@ mod tests {
|
||||
let mut wavs: Vec<_> = std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.file_name().to_string_lossy().into_owned()).collect();
|
||||
wavs.sort();
|
||||
assert_eq!(wavs, vec!["Take-2.wav".to_string(), "Take.wav".to_string()]);
|
||||
|
||||
fn midi_engine() -> Engine {
|
||||
use soundcraft_midi::{CtrlEvent, CtrlKind, Note, Sequence};
|
||||
use soundcraft_model::{ChannelFormat, Clip, TrackKind};
|
||||
let mut s = Session::default();
|
||||
let keys = s.add_track(TrackKind::Midi, ChannelFormat::Mono, Some("Keys"));
|
||||
let drums = s.add_track(TrackKind::Midi, ChannelFormat::Mono, Some("Drums"));
|
||||
let _audio = s.add_track(TrackKind::Audio, ChannelFormat::Mono, Some("Room"));
|
||||
let mut keys_seq = Sequence::default();
|
||||
keys_seq.notes.push(Note { pitch: 60, velocity: 100, release_velocity: 64, channel: 0, start: 0, length: 480 });
|
||||
keys_seq.ctrls.push(CtrlEvent { tick: 10, channel: 0, kind: CtrlKind::Cc(7), value: 90 });
|
||||
let mut drum_seq = Sequence::default();
|
||||
drum_seq.notes.push(Note { pitch: 36, velocity: 110, release_velocity: 64, channel: 9, start: 0, length: 120 });
|
||||
drum_seq.ctrls.push(CtrlEvent { tick: 20, channel: 9, kind: CtrlKind::Cc(11), value: 40 });
|
||||
let a = s.new_clip_id();
|
||||
let b = s.new_clip_id();
|
||||
crate::edit::place_clip(&mut s, keys, Clip::midi(a, "Keys", 0, 48_000, keys_seq));
|
||||
crate::edit::place_clip(&mut s, drums, Clip::midi(b, "Drums", 0, 48_000, drum_seq));
|
||||
Engine::new(s)
|
||||
}
|
||||
|
||||
fn cc_numbers(bytes: &[u8]) -> Vec<(String, u8, i32)> {
|
||||
let smf = soundcraft_midi::read_smf(bytes).unwrap();
|
||||
let mut out = Vec::new();
|
||||
for t in &smf.tracks {
|
||||
for c in &t.sequence.ctrls {
|
||||
if let soundcraft_midi::CtrlKind::Cc(n) = c.kind {
|
||||
out.push((t.name.clone(), n, c.value));
|
||||
}
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn midi_export_keeps_controllers_and_honours_tracks() {
|
||||
let mut e = midi_engine();
|
||||
let dir = std::env::temp_dir().join(format!("sc-midi-export-{}", std::process::id()));
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
std::fs::create_dir_all(&dir).unwrap();
|
||||
let all = dir.join("all.mid");
|
||||
e.execute("file.export_midi", &json!({"path": all.to_string_lossy()})).unwrap();
|
||||
let ctrls = cc_numbers(&std::fs::read(&all).unwrap());
|
||||
assert!(ctrls.iter().any(|(n, cc, v)| n == "Keys" && *cc == 7 && *v == 90), "{ctrls:?}");
|
||||
assert!(ctrls.iter().any(|(n, cc, v)| n == "Drums" && *cc == 11 && *v == 40), "{ctrls:?}");
|
||||
assert!(ctrls.iter().all(|(n, _, _)| n != "Room"));
|
||||
|
||||
let keys = dir.join("keys.mid");
|
||||
e.execute("file.export_midi", &json!({"path": keys.to_string_lossy(), "tracks": ["Keys"]})).unwrap();
|
||||
let ctrls = cc_numbers(&std::fs::read(&keys).unwrap());
|
||||
assert_eq!(ctrls.len(), 1, "{ctrls:?}");
|
||||
assert_eq!(ctrls[0].0, "Keys");
|
||||
|
||||
let err = e.execute("file.export_midi", &json!({"path": dir.join("nope.mid").to_string_lossy(), "tracks": ["Room"]})).unwrap_err();
|
||||
assert!(err.to_string().contains("none of the requested tracks hold MIDI"), "{err}");
|
||||
let _ = std::fs::remove_dir_all(&dir);
|
||||
}
|
||||
}
|
||||
+13
-4
@@ -180,8 +180,8 @@ pub fn import_midi_bytes(e: &mut Engine, bytes: &[u8], at: Samples, tempo_map: b
|
||||
Ok(out)
|
||||
}
|
||||
|
||||
/// Export all MIDI clips as a format-1 SMF.
|
||||
pub fn export_midi(e: &Engine) -> Result<Vec<u8>> {
|
||||
/// Export MIDI clips as a format-1 SMF. `only` limits the file to those tracks.
|
||||
pub fn export_midi(e: &Engine, only: Option<&[TrackId]>) -> Result<Vec<u8>> {
|
||||
let s = e.session();
|
||||
let mut smf = soundcraft_midi::Smf {
|
||||
format: 1,
|
||||
@@ -191,16 +191,25 @@ pub fn export_midi(e: &Engine) -> Result<Vec<u8>> {
|
||||
markers: s.markers.iter().map(|m| (s.tempo.samples_to_ticks(m.start, s.sample_rate), m.name.clone())).collect(),
|
||||
key_sigs: Vec::new(),
|
||||
};
|
||||
for t in s.tracks.iter().filter(|t| t.kind.is_midi()) {
|
||||
let chosen: Vec<_> = s.tracks.iter().filter(|t| t.kind.is_midi() && only.is_none_or(|ids| ids.contains(&t.id))).collect();
|
||||
if only.is_some() && chosen.is_empty() {
|
||||
return Err(EngineError::BadParams("file.export_midi".into(), "none of the requested tracks hold MIDI".into()));
|
||||
}
|
||||
for t in chosen {
|
||||
let mut seq = soundcraft_midi::Sequence::default();
|
||||
for c in t.clips() {
|
||||
if let ClipContent::Midi { sequence } = &c.content {
|
||||
let base = s.tempo.samples_to_ticks(c.start, s.sample_rate);
|
||||
for n in &sequence.notes {
|
||||
let mut n = *n;
|
||||
n.start += base;
|
||||
n.start = n.start.saturating_add(base);
|
||||
seq.notes.push(n);
|
||||
}
|
||||
for ev in &sequence.ctrls {
|
||||
let mut ev = *ev;
|
||||
ev.tick = ev.tick.saturating_add(base);
|
||||
seq.ctrls.push(ev);
|
||||
}
|
||||
}
|
||||
}
|
||||
seq.sort();
|
||||
|
||||
Reference in new issue
Block a user