soaos/bevy_rustysynth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added bank switching + render chunking for sequences

Browse Source
This commit is contained in:
Silas Bartha 2024-09-19 21:18:38 -04:00
parent 86d578c587
commit f6914ca55f
Signed by: soaos
GPG Key ID: 9BD3DCC0D56A09B2
2 changed files with 57 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
name = "bevy_rustysynth" name = "bevy_rustysynth"
description = "A plugin which adds MIDI file and soundfont audio support to the bevy engine via rustysynth." description = "A plugin which adds MIDI file and soundfont audio support to the bevy engine via rustysynth."
version = "0.2.0" version = "0.2.1"
edition = "2021" edition = "2021"
license = "0BSD OR MIT OR Apache-2.0" license = "0BSD OR MIT OR Apache-2.0"

101
src/assets.rs
View File

@ -21,6 +21,8 @@ pub struct MidiNote {
pub channel: i32, pub channel: i32,
/// Preset (instrument) to play the note with (see GM spec.) /// Preset (instrument) to play the note with (see GM spec.)
pub preset: i32, pub preset: i32,
/// Bank to play note with
pub bank: i32,
/// Key to play (60 is middle C) /// Key to play (60 is middle C)
pub key: i32, pub key: i32,
/// Velocity to play note at /// Velocity to play note at
@ -34,6 +36,7 @@ impl Default for MidiNote {
Self { Self {
channel: 0, channel: 0,
preset: 0, preset: 0,
bank: 0,
key: 60, key: 60,
velocity: 100, velocity: 100,
duration: Duration::from_secs(1), duration: Duration::from_secs(1),
@ -91,56 +94,64 @@ impl MidiFileDecoder {
pub fn new(midi: MidiAudio, soundfont: Arc<SoundFont>) -> Self { pub fn new(midi: MidiAudio, soundfont: Arc<SoundFont>) -> Self {
let sample_rate = 44100_usize; let sample_rate = 44100_usize;
let (tx, rx) = async_channel::bounded::<f32>(sample_rate * 2); let (tx, rx) = async_channel::bounded::<f32>(sample_rate * 2);
AsyncComputeTaskPool::get().spawn(async move { AsyncComputeTaskPool::get()
let settings = SynthesizerSettings::new(sample_rate as i32); .spawn(async move {
let mut synthesizer = let settings = SynthesizerSettings::new(sample_rate as i32);
Synthesizer::new(&soundfont, &settings).expect("Failed to create synthesizer."); let mut synthesizer =
Synthesizer::new(&soundfont, &settings).expect("Failed to create synthesizer.");
match midi { match midi {
MidiAudio::File(midi_data) => { MidiAudio::File(midi_data) => {
let mut sequencer = MidiFileSequencer::new(synthesizer); let mut sequencer = MidiFileSequencer::new(synthesizer);
let mut midi_data = Cursor::new(midi_data); let mut midi_data = Cursor::new(midi_data);
let midi = let midi = Arc::new(
Arc::new(MidiFile::new(&mut midi_data).expect("Failed to read midi file.")); MidiFile::new(&mut midi_data).expect("Failed to read midi file."),
sequencer.play(&midi, false); );
let mut left: Vec<f32> = vec![0_f32; sample_rate]; sequencer.play(&midi, false);
let mut right: Vec<f32> = vec![0_f32; sample_rate]; let mut left: Vec<f32> = vec![0_f32; sample_rate];
while !sequencer.end_of_sequence() { let mut right: Vec<f32> = vec![0_f32; sample_rate];
sequencer.render(&mut left, &mut right); while !sequencer.end_of_sequence() {
for value in left.iter().interleave(right.iter()) { sequencer.render(&mut left, &mut right);
if let Err(_) = tx.send(*value).await { for value in left.iter().interleave(right.iter()) {
return; if let Err(_) = tx.send(*value).await {
}; return;
};
}
}
}
MidiAudio::Sequence(sequence) => {
for MidiNote {
channel,
preset,
bank,
key,
velocity,
duration,
} in sequence.iter()
{
synthesizer.process_midi_message(*channel, 0xB0, 0x00, *bank);
synthesizer.process_midi_message(*channel, 0xC0, *preset, 0);
synthesizer.note_on(*channel, *key, *velocity);
let note_length =
(sample_rate as f32 * duration.as_secs_f32()) as usize;
let mut left: Vec<f32> = vec![0_f32; note_length];
let mut right: Vec<f32> = vec![0_f32; note_length];
for (left, right) in left.chunks_mut(sample_rate).zip(right.chunks_mut(sample_rate)) {
synthesizer.render(left, right);
for value in left.iter().interleave(right.iter()) {
if let Err(_) = tx.send(*value).await {
return;
};
}
}
synthesizer.note_off(*channel, *key);
} }
} }
} }
MidiAudio::Sequence(sequence) => {
for MidiNote {
channel,
preset,
key,
velocity,
duration,
} in sequence.iter()
{
synthesizer.process_midi_message(*channel, 0b1100_0000, *preset, 0);
synthesizer.note_on(*channel, *key, *velocity);
let note_length = (sample_rate as f32 * duration.as_secs_f32()) as usize;
let mut left: Vec<f32> = vec![0_f32; note_length];
let mut right: Vec<f32> = vec![0_f32; note_length];
synthesizer.render(&mut left, &mut right);
for value in left.iter().interleave(right.iter()) {
if let Err(_) = tx.send(*value).await {
return;
};
}
synthesizer.note_off(*channel, *key);
}
}
}
tx.close(); tx.close();
}).detach(); })
.detach();
Self { Self {
sample_rate, sample_rate,
stream: rx, stream: rx,