bel/composer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

syn accepts tones isntead of i32

Browse Source
This commit is contained in:
breel
2026-03-11 09:27:27 -06:00
parent 37fb8940ec
commit ff3911fee9
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/syn.rs
View File

@@ -3,6 +3,8 @@ use rustysynth::SoundFont;
use rustysynth::SynthesizerSettings;
use std::sync::Arc;
use crate::tone;
pub enum Syn {
Real(Synthesizer),
Text{
@@ -29,16 +31,16 @@ impl Syn {
Syn::Real(synthesizer)
}
pub fn tone_on(&mut self, a: i32, b: i32, c: i32) {
pub fn tone_on(&mut self, a: i32, b: tone::Tone, c: i32) {
match self {
Syn::Real(syn) => syn.note_on(a, b, c),
Syn::Real(syn) => syn.note_on(a, b.i32(), c),
Syn::Text{m, ..} => {
eprintln!("tone_on({:?}, {:?}, {:?})", a, b, c);
eprintln!("tone_on({:?}, {:?}, {:?})", a, b.i32(), c);
match m.get_mut(&a) {
Some(m2) => { m2.insert(b, c); },
Some(m2) => { m2.insert(b.i32(), c); },
None => {
let mut m2 = std::collections::HashMap::new();
m2.insert(b, c);
m2.insert(b.i32(), c);
m.insert(a, m2);
},
};
@@ -46,13 +48,13 @@ impl Syn {
};
}
pub fn tone_off(&mut self, a: i32, b: i32) {
pub fn tone_off(&mut self, a: i32, b: tone::Tone) {
match self {
Syn::Real(syn) => syn.note_off(a, b),
Syn::Real(syn) => syn.note_off(a, b.i32()),
Syn::Text{m, ..} => {
eprintln!("tone_off({:?}, {:?})", a, b);
eprintln!("tone_off({:?}, {:?})", a, b.i32());
match m.get_mut(&a) {
Some(m) => { m.remove(&b); },
Some(m) => { m.remove(&b.i32()); },
None => {},
};
@@ -79,10 +81,10 @@ mod test {
fn test_new_real() {
let mut syn = Syn::new(false, "super_small_font.sf2".to_string(), 44100);
syn.tone_on(1, 2, 3);
syn.tone_on(2, 3, 4);
syn.tone_on(1, tone::new("c"), 3);
syn.tone_on(2, tone::new("d"), 4);
syn.tone_off(2, 3);
syn.tone_off(2, tone::new("d"));
let mut buffer1 = Vec::<f32>::new();
let mut buffer2 = Vec::<f32>::new();
@@ -93,10 +95,10 @@ mod test {
fn test_text() {
let mut syn = Syn::new(true, ".sf2".to_string(), 1);
syn.tone_on(1, 2, 3);
syn.tone_on(2, 3, 4);
syn.tone_on(1, tone::new("c"), 3);
syn.tone_on(2, tone::new("d"), 4);
syn.tone_off(2, 3);
syn.tone_off(2, tone::new("d"));
let mut buffer1 = Vec::<f32>::new();
let mut buffer2 = Vec::<f32>::new();