Update xsynth for sf2 support / add threadpool (#63)

Cargo.toml

@@ -18,8 +18,8 @@ egui = "0.21.0"
 winit = "0.28.3"
 rayon = "1.7.0"
 midi-toolkit-rs = { git = "https://github.com/arduano/midi-toolkit-rs.git", rev = "a54f198" }
-xsynth-core = { git = "https://github.com/arduano/xsynth.git", rev = "e300f1d" }
-xsynth-realtime = { git = "https://github.com/arduano/xsynth.git", rev = "e300f1d" }
+xsynth-core = { git = "https://github.com/arduano/xsynth.git", rev = "3385cd0" }
+xsynth-realtime = { git = "https://github.com/arduano/xsynth.git", rev = "3385cd0" }
 gen-iter = { git = "https://github.com/arduano/gen-iter.git", rev = "64e28bc" }
 enum_dispatch = "0.3.11"
 palette = "0.7.1"

src/audio_playback/mod.rs

@@ -7,6 +7,7 @@ pub mod xsynth;
 pub enum AudioPlayerType {
     XSynth {
         buffer: f64,
+        use_threadpool: bool,
         ignore_range: RangeInclusive<u8>,
         options: ChannelInitOptions,
     },
@@ -24,10 +25,12 @@ impl SimpleTemporaryPlayer {
         let (xsynth, kdmapi) = match player_type.clone() {
             AudioPlayerType::XSynth {
                 buffer,
+                use_threadpool,
                 ignore_range,
                 options,
             } => {
-                let xsynth = xsynth::XSynthPlayer::new(buffer, ignore_range, options);
+                let xsynth =
+                    xsynth::XSynthPlayer::new(buffer, use_threadpool, ignore_range, options);
                 (Some(xsynth), None)
             }
             AudioPlayerType::Kdmapi => {

src/audio_playback/xsynth.rs

@@ -43,10 +43,15 @@ pub struct XSynthPlayer {
 }
 
 impl XSynthPlayer {
-    pub fn new(buffer: f64, ignore_range: RangeInclusive<u8>, options: ChannelInitOptions) -> Self {
+    pub fn new(
+        buffer: f64,
+        use_threadpool: bool,
+        ignore_range: RangeInclusive<u8>,
+        options: ChannelInitOptions,
+    ) -> Self {
         let config = XSynthRealtimeConfig {
             render_window_ms: buffer,
-            use_threadpool: false,
+            use_threadpool,
             channel_init_options: options,
             ignore_range,
             ..Default::default()

src/gui/window.rs

@@ -47,6 +47,7 @@ impl GuiWasabiWindow {
                 let synth = Arc::new(RwLock::new(SimpleTemporaryPlayer::new(
                     AudioPlayerType::XSynth {
                         buffer: settings.synth.buffer_ms,
+                        use_threadpool: settings.synth.use_threadpool,
                         ignore_range: settings.synth.vel_ignore.clone(),
                         options: convert_to_channel_init(settings),
                     },

src/gui/window/settings_window.rs

@@ -59,6 +59,7 @@ pub fn draw_settings(
                                     .unwrap()
                                     .switch_player(AudioPlayerType::XSynth {
                                         buffer: settings.synth.buffer_ms,
+                                        use_threadpool: settings.synth.use_threadpool,
                                         ignore_range: settings.synth.vel_ignore.clone(),
                                         options: convert_to_channel_init(settings),
                                     });

src/gui/window/xsynth_settings.rs

@@ -51,7 +51,7 @@ pub fn draw_xsynth_settings(
                         if ui.button("Browse...").clicked() {
                             // If windows, just use the native dialog
                             let sfz_path = rfd::FileDialog::new()
-                                .add_filter("sfz", &["sfz"])
+                                .add_filter("sfz/sf2", &["sfz", "sf2"])
                                 .pick_file();
 
                             if let Some(sfz_path) = sfz_path {
@@ -141,6 +141,10 @@ pub fn draw_xsynth_settings(
                     ui.label("Use Effects*: ");
                     ui.checkbox(&mut settings.synth.use_effects, "");
                     ui.end_row();
+
+                    ui.label("Use Threadpool*: ");
+                    ui.checkbox(&mut settings.synth.use_threadpool, "");
+                    ui.end_row();
                 });
 
             ui.separator();
@@ -152,6 +156,7 @@ pub fn draw_xsynth_settings(
                         .unwrap()
                         .switch_player(AudioPlayerType::XSynth {
                             buffer: settings.synth.buffer_ms,
+                            use_threadpool: settings.synth.use_threadpool,
                             ignore_range: settings.synth.vel_ignore.clone(),
                             options: convert_to_channel_init(settings),
                         });

src/settings/migrations.rs

@@ -16,6 +16,7 @@ pub struct WasabiConfigFileV0 {
     last_key: u8,
     midi_loading: usize,
     buffer_ms: f64,
+    use_threadpool: bool,
     limit_layers: bool,
     layer_count: usize,
     fade_out_kill: bool,
@@ -39,6 +40,7 @@ impl WasabiConfigFileV0 {
                 synth: SynthSettings {
                     synth: Synth::from(cfg.synth),
                     buffer_ms: cfg.buffer_ms,
+                    use_threadpool: cfg.use_threadpool,
                     limit_layers: cfg.limit_layers,
                     layer_count: cfg.layer_count,
                     fade_out_kill: cfg.fade_out_kill,

src/settings/mod.rs

@@ -290,6 +290,7 @@ impl Default for MidiSettings {
 pub struct SynthSettings {
     pub synth: Synth,
     pub buffer_ms: f64,
+    pub use_threadpool: bool,
     pub sfz_path: String,
     pub limit_layers: bool,
     pub layer_count: usize,
@@ -305,6 +306,7 @@ impl Default for SynthSettings {
         SynthSettings {
             synth: Synth::XSynth,
             buffer_ms: XSynthRealtimeConfig::default().render_window_ms,
+            use_threadpool: false,
             sfz_path: String::new(),
             limit_layers: true,
             layer_count: 4,