sym to own file

src/flags.rs

@@ -10,6 +10,9 @@ pub struct Flags {
 
     #[arg(long, default_value_t = 44100)] 
     pub sample_rate: usize,
+
+    #[arg(long, default_value = "super_small_font.sf2")] 
+    pub sound_font: String,
 }
 
 impl Flags {

src/main.rs

@@ -1,36 +1,24 @@
 use itertools::Itertools;
-use rustysynth::SoundFont;
-use rustysynth::Synthesizer;
-use rustysynth::SynthesizerSettings;
-use std::fs::File;
-use std::sync::Arc;
 use tinyaudio::prelude::*;
 
 mod flags;
+mod syn;
 
 fn main() {
     let flags = flags::Flags::new();
 
-    // Load the SoundFont.
-    let mut sf2 = File::open("super_small_font.sf2").unwrap();
-    let sound_font = Arc::new(SoundFont::new(&mut sf2).unwrap());
+    let mut syn = syn::Syn::new(
+        flags.debug,
+        flags.sound_font,
+        flags.sample_rate,
+    );
 
-    // Setup the audio output.
     let params = OutputDeviceParameters {
         channels_count: 2,
         sample_rate: flags.sample_rate,
         channel_sample_count: flags.sample_rate / flags.smallest_note,
     };
 
-    // Create the synthesizer.
-    let settings = SynthesizerSettings::new(params.sample_rate as i32);
-    let synthesizer = Synthesizer::new(&sound_font, &settings).unwrap();
-
-    let mut syn = match &flags.debug{
-        false => Syn::Real(synthesizer),
-        true => Syn::Text(std::collections::HashMap::new()),
-    };
-
     // Play some notes (middle C, E, G). // 16 channels actually // 60=c 64=e 67=g //up to 128velocity though dont go below 50 tbh // 12 notes per octave
     syn.note_on(0, 64 + 12, 127);
     //syn.render(&mut left[..], &mut right[..]); // puts in a state of rendering the first loop of these notes
@@ -54,49 +42,3 @@ fn main() {
     std::thread::sleep(std::time::Duration::from_secs(2));
 }
 
-enum Syn {
-    Real(Synthesizer),
-    Text(std::collections::HashMap<i32, std::collections::HashMap<i32, i32>>),
-}
-
-impl Syn {
-    fn note_on(&mut self, a: i32, b: i32, c: i32) {
-        match self {
-            Syn::Real(syn) => syn.note_on(a, b, c),
-            Syn::Text(m) => {
-                eprintln!("note_on({:?}, {:?}, {:?})", a, b, c);
-                match m.get_mut(&a) {
-                    Some(m2) => { m2.insert(b, c); },
-                    None => {
-                        let mut m2 = std::collections::HashMap::new();
-                        m2.insert(b, c);
-                        m.insert(a, m2);
-                    },
-                };
-            },
-        };
-    }
-
-    fn note_off(&mut self, a: i32, b: i32) {
-        match self {
-            Syn::Real(syn) => syn.note_off(a, b),
-            Syn::Text(m) => {
-                eprintln!("note_off({:?}, {:?})", a, b);
-                match m.get_mut(&a) {
-                    Some(m) => { m.remove(&b); },
-                    None => {},
-                };
-
-            },
-        };
-    }
-
-    fn render(&mut self, a: &mut [f32], b: &mut [f32]) {
-        match self {
-            Syn::Real(syn) => syn.render(a, b),
-            Syn::Text(m) => {
-                eprintln!("render({:?})", m)
-            },
-        };
-    }
-}

src/syn.rs

@@ -0,0 +1,68 @@
+use rustysynth::Synthesizer;
+use rustysynth::SoundFont;
+use rustysynth::SynthesizerSettings;
+use std::sync::Arc;
+
+pub enum Syn {
+    Real(Synthesizer),
+    Text(std::collections::HashMap<i32, std::collections::HashMap<i32, i32>>),
+}
+
+impl Syn {
+    pub fn new(debug: bool, sound_font: String, sample_rate: usize) -> Syn {
+        match debug {
+            false => Syn::new_real(sound_font, sample_rate),
+            true => Syn::Text(std::collections::HashMap::new()),
+        }
+    }
+
+    fn new_real(sound_font: String, sample_rate: usize) -> Syn {
+        let mut sf2 = std::fs::File::open(sound_font).unwrap();
+        let sound_font = Arc::new(SoundFont::new(&mut sf2).unwrap());
+
+        let settings = SynthesizerSettings::new(sample_rate as i32);
+
+        let synthesizer = Synthesizer::new(&sound_font, &settings).unwrap();
+        Syn::Real(synthesizer)
+    }
+
+    pub fn note_on(&mut self, a: i32, b: i32, c: i32) {
+        match self {
+            Syn::Real(syn) => syn.note_on(a, b, c),
+            Syn::Text(m) => {
+                eprintln!("note_on({:?}, {:?}, {:?})", a, b, c);
+                match m.get_mut(&a) {
+                    Some(m2) => { m2.insert(b, c); },
+                    None => {
+                        let mut m2 = std::collections::HashMap::new();
+                        m2.insert(b, c);
+                        m.insert(a, m2);
+                    },
+                };
+            },
+        };
+    }
+
+    pub fn note_off(&mut self, a: i32, b: i32) {
+        match self {
+            Syn::Real(syn) => syn.note_off(a, b),
+            Syn::Text(m) => {
+                eprintln!("note_off({:?}, {:?})", a, b);
+                match m.get_mut(&a) {
+                    Some(m) => { m.remove(&b); },
+                    None => {},
+                };
+
+            },
+        };
+    }
+
+    pub fn render(&mut self, a: &mut [f32], b: &mut [f32]) {
+        match self {
+            Syn::Real(syn) => syn.render(a, b),
+            Syn::Text(m) => {
+                eprintln!("render({:?})", m)
+            },
+        };
+    }
+}