get sound font file from both exe path and current dircetory

Author: yjpark

apps/notation_viewer/Makefile.toml

@@ -51,12 +51,13 @@ dependencies = ["build-web", "basic-http-server"]
 disabled = true
 
 [tasks.release-inspector]
-args = ["bundle", "--release", "--features", "inspector", "@@split(CARGO_RELEASE_ARGS, )"]
+args = ["bundle", "--features", "inspector", "@@split(CARGO_RELEASE_ARGS, )"]
 command = "cargo"
 
 [tasks.release-native]
-args = ["bundle", "--release", "--features", "native", "@@split(CARGO_RELEASE_ARGS, )"]
+args = ["bundle", "--features", "native", "@@split(CARGO_RELEASE_ARGS, )"]
 command = "cargo"
+dependencies = ["build-native"]
 
 [tasks.release-web]
 script_runner = "@shell"

apps/notation_viewer/release-viewer_osx.bash

@@ -2,11 +2,15 @@
 
 cd `dirname $(readlink -f "$0")`
 
-cargo make release-native
+# cargo make --profile release release-native
+
+cargo build --release --features native
+cargo bundle --release --features native
+
 cd ../../
-rm -rf ../../target/release/osx/notation_viewer.app
+rm -rf release/osx/notation_viewer.app
 cp -vr target/release/bundle/osx/notation_viewer.app/ release/osx/
-cd release/osx/notation_viewer.app/Content/MacOS
+cd release/osx/notation_viewer.app/Contents/MacOS
 ln -s ../Resources/assets .
 cd ../../
 

crates/notation_midi/src/native/midi_synth.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use helgoboss_midi::StructuredShortMessage;
 
 use crate::prelude::{MidiMessage, MidiSettings, MidiState};
@@ -10,16 +12,51 @@ pub struct MidiSynth {
     buffer: DoubleAudioBuffer,
 }
 impl MidiSynth {
+    pub const SOUND_FONT: &'static str = "sblive";
     fn new(synth: fluidlite::Synth) -> Self {
         Self {
             synth,
             buffer: DoubleAudioBuffer::new(),
         }
     }
+    fn check_path(root: PathBuf, name: &str) -> Option<PathBuf> {
+        let mut path = root.clone();
+        path.push("assets");
+        path.push(name);
+        path.set_extension("sf2");
+        if path.exists() {
+            Some(path)
+        } else {
+            println!("MidiSynth check_path() not exist: {:?} {} -> {:?}", root, name, path);
+            None
+        }
+    }
     pub fn try_new() -> Option<MidiSynth> {
         fluidlite::Settings::new()
             .and_then(fluidlite::Synth::new)
-            .and_then(|synth| synth.sfload("assets/sblive.sf2", true).map(|_| synth))
+            .and_then(|synth| {
+                let mut path = None;
+                if let Ok(root) = std::env::current_exe() {
+                    if let Some(root) = root.parent() {
+                        path = Self::check_path(root.to_path_buf(), Self::SOUND_FONT);
+                    }
+                }
+                if path.is_none() {
+                    if let Ok(root) = std::env::current_dir() {
+                        path = Self::check_path(root, Self::SOUND_FONT);
+                    }
+                }
+                match path {
+                    Some(path) => {
+                        println!("MidiSynth try_new() Loading: {:?}", path);
+                        synth.sfload(path, true).map(|_| synth)
+                    },
+                    None => {
+                        let path = format!("assets/{}.sf2", Self::SOUND_FONT);
+                        synth.sfload(path, true).map(|_| synth)
+                    }
+                }
+            })
             .map(Self::new)
             .map_err(|err| {
                 println!("MidiSynth try_new() failed: {:?}", err);

crates/notation_model/src/play/play_clock.rs

@@ -30,7 +30,4 @@ impl PlayClock {
     pub fn delta_seconds(&self) -> f32 {
         self.delta.as_secs_f32()
     }
-    pub fn get_now() {
-        StdInstant::now();
-    }
 }