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

rename note to tone for syn

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

2
src/main.rs
View File

@@ -13,7 +13,7 @@ fn main() {
flags.sample_rate, flags.sample_rate,
); );
// Play some tones (middle C, E, G). // 16 channels actually // 60=c 64=e 67=g //up to 128velocity though dont go below 50 tbh // 12 tones per octave // Play some tones (middle C, E, G). // 16 channels actually // 60=c 64=e 67=g //up to 128velocity though dont go below 50 tbh // 12 tones per octave
syn.note_on(0, tone::new("c").i32(), 127); syn.tone_on(0, tone::new("c").i32(), 127);
play(syn, flags.sample_rate, flags.bpm, flags.smallest_note); play(syn, flags.sample_rate, flags.bpm, flags.smallest_note);
} }

20
src/syn.rs
View File

@@ -29,11 +29,11 @@ impl Syn {
Syn::Real(synthesizer) Syn::Real(synthesizer)
} }
pub fn note_on(&mut self, a: i32, b: i32, c: i32) { pub fn tone_on(&mut self, a: i32, b: i32, c: i32) {
match self { match self {
Syn::Real(syn) => syn.note_on(a, b, c), Syn::Real(syn) => syn.note_on(a, b, c),
Syn::Text{m, ..} => { Syn::Text{m, ..} => {
eprintln!("note_on({:?}, {:?}, {:?})", a, b, c); eprintln!("tone_on({:?}, {:?}, {:?})", a, b, c);
match m.get_mut(&a) { match m.get_mut(&a) {
Some(m2) => { m2.insert(b, c); }, Some(m2) => { m2.insert(b, c); },
None => { None => {
@@ -46,11 +46,11 @@ impl Syn {
}; };
} }
pub fn note_off(&mut self, a: i32, b: i32) { pub fn tone_off(&mut self, a: i32, b: i32) {
match self { match self {
Syn::Real(syn) => syn.note_off(a, b), Syn::Real(syn) => syn.note_off(a, b),
Syn::Text{m, ..} => { Syn::Text{m, ..} => {
eprintln!("note_off({:?}, {:?})", a, b); eprintln!("tone_off({:?}, {:?})", a, b);
match m.get_mut(&a) { match m.get_mut(&a) {
Some(m) => { m.remove(&b); }, Some(m) => { m.remove(&b); },
None => {}, None => {},
@@ -79,10 +79,10 @@ mod test {
fn test_new_real() { fn test_new_real() {
let mut syn = Syn::new(false, "super_small_font.sf2".to_string(), 44100); let mut syn = Syn::new(false, "super_small_font.sf2".to_string(), 44100);
syn.note_on(1, 2, 3); syn.tone_on(1, 2, 3);
syn.note_on(2, 3, 4); syn.tone_on(2, 3, 4);
syn.note_off(2, 3); syn.tone_off(2, 3);
let mut buffer1 = Vec::<f32>::new(); let mut buffer1 = Vec::<f32>::new();
let mut buffer2 = Vec::<f32>::new(); let mut buffer2 = Vec::<f32>::new();
@@ -93,10 +93,10 @@ mod test {
fn test_text() { fn test_text() {
let mut syn = Syn::new(true, ".sf2".to_string(), 1); let mut syn = Syn::new(true, ".sf2".to_string(), 1);
syn.note_on(1, 2, 3); syn.tone_on(1, 2, 3);
syn.note_on(2, 3, 4); syn.tone_on(2, 3, 4);
syn.note_off(2, 3); syn.tone_off(2, 3);
let mut buffer1 = Vec::<f32>::new(); let mut buffer1 = Vec::<f32>::new();
let mut buffer2 = Vec::<f32>::new(); let mut buffer2 = Vec::<f32>::new();