wip

Author: yjpark

crates/notation_core/src/scale.rs

@@ -300,7 +300,8 @@ impl Scale {
         (Semitones::from(*note) - self.calc_do_semitones(key)).into()
     }
     pub fn calc_note(&self, key: &Key, syllable_note: &SyllableNote) -> Note {
-        (Semitones::from(*syllable_note) + self.calc_do_semitones(key)).into()
+        let pitch = self.calc_pitch(key, &syllable_note.syllable);
+        Note::new(syllable_note.octave, pitch)
     }
     pub fn calc_click_note(&self, key: &Key, octave: &Octave, syllable: &Syllable) -> Note {
         let pitch = self.calc_pitch(key, syllable);

crates/notation_dsl/src/core/note.rs

@@ -69,7 +69,7 @@ impl NoteDsl {
             let syllable = Syllable::from((pitch_sign.sign, pitch_name.name));
             Context::calc_note(octave_tweak, &syllable)
         } else {
-            let octave = Context::octave(octave_tweak);
+            let octave = Context::tweaked_octave(octave_tweak);
             let pitch = Pitch::new(pitch_name.name, pitch_sign.sign);
             Note::new(octave, pitch)
         }

crates/notation_midi/src/native/embedded_api.rs

@@ -11,7 +11,7 @@ pub struct EmbeddedApi;
 
 impl FileApi for EmbeddedApi {
     type File = EmbeddedFile;
-    fn open(&mut self, filename: &Path) -> Option<Self::File> {
+    fn open(&mut self, _filename: &Path) -> Option<Self::File> {
         let bytes = include_bytes!("../../assets/sblive.sf2");
         Some(Self::File {
             pos: 0,