fixes #106, bugfix with loop mode midi message control, also add keyboard shortcuts for loop mode, set A, set B, and Clear A/B

Author: yjpark

crates/notation_bevy/src/app/app.rs

@@ -209,13 +209,26 @@ fn handle_keyboard_inputs(
     } else if keyboard_input.just_released(KeyCode::Space) {
         crate::viewer::control::ControlView::play_or_pause(&mut midi_state, &mut play_control_evts);
     } else if keyboard_input.just_released(KeyCode::Return) {
-        crate::viewer::control::ControlView::play_or_stop(&mut midi_state, &mut play_control_evts);
+        crate::viewer::control::ControlView::stop(&mut midi_state, &mut play_control_evts);
     } else if keyboard_input.just_released(KeyCode::Backslash) {
         crate::viewer::control::ControlView::toggle_layout_mode(&mut app_state, &mut settings, &mut theme);
     } else if keyboard_input.just_released(KeyCode::M) {
         crate::viewer::control::ControlView::toggle_show_melody_syllable(&mut app_state, &mut settings, &mut theme);
     } else if keyboard_input.just_released(KeyCode::F) {
         crate::viewer::control::ControlView::toggle_always_show_fret(&mut app_state, &mut settings, &mut theme);
+    } else if keyboard_input.just_released(KeyCode::L) {
+        settings.should_loop = !settings.should_loop;
+        crate::viewer::control::ControlView::sync_should_loop(
+            &settings,
+            &mut midi_state,
+            &mut play_control_evts,
+        );
+    } else if keyboard_input.just_released(KeyCode::A) {
+        crate::viewer::control::ControlView::set_begin_bar_ordinal(&mut midi_state, &mut play_control_evts);
+    } else if keyboard_input.just_released(KeyCode::B) {
+        crate::viewer::control::ControlView::set_end_bar_ordinal(&mut midi_state, &mut play_control_evts);
+    } else if keyboard_input.just_released(KeyCode::C) {
+        crate::viewer::control::ControlView::clear_begin_end(&mut midi_state, &mut play_control_evts);
     }
 }
 

crates/notation_bevy/src/viewer/control.rs

@@ -360,6 +360,9 @@ impl ControlView {
                 if ui.button(format!("End: {}", midi_state.play_control.end_bar_ordinal)).clicked() {
                     Self::set_end_bar_ordinal(midi_state, play_control_evts);
                 }
+                if ui.button("Clear").clicked() {
+                    Self::clear_begin_end(midi_state, play_control_evts);
+                }
             });
             ui.add(Slider::new(&mut settings.speed_factor, 0.1..=2.0).text("Speed"));
             if float_ne!(play_speed, settings.speed_factor, abs <= 0.01) {

crates/notation_midi/src/midi_hub.rs

@@ -79,12 +79,13 @@ impl MidiHub {
         }
         self.check_output(settings);
         if let Some(synth) = &self.output_synth {
+            //println!("send to synth: {:?}", msg);
             if let Err(err) = synth.send(speed, msg) {
                 println!("send to synth failed: {:?} -> {:?}", msg, err);
             }
         }
         if let Some(conn) = &self.output_conn {
-            //println!("send midi: {:?}", msg);
+            //println!("send to midi: {:?}", msg);
             if let Err(err) = conn.lock().unwrap().send(&msg.to_midi()) {
                 println!("send to midi failed: {:?} -> {:?}", msg, err);
             }

crates/notation_midi/src/midi_state.rs

@@ -66,8 +66,9 @@ impl MidiChannel {
         }
     }
     pub fn calc_next_index(&mut self, position: &BarPosition) {
+        let pos_units = Units::from(*position);
         for (index, value) in self.messages.iter().enumerate() {
-            if Units::from(value.bar_position()) >= Units::from(*position) {
+            if Units::from(value.bar_position()) >= pos_units {
                 self.next_index = index;
                 return;
             }
@@ -82,13 +83,18 @@ impl MidiChannel {
         old_position: &Position,
         play_control: &PlayControl,
         end_passed: bool,
+        jumped: bool,
     ) -> usize {
         if self.messages.len() == 0 {
             return 0;
         }
-        if end_passed {
+        if end_passed || jumped {
             self.init_channel(settings, hub, speed);
-            self.calc_next_index(&play_control.begin_bar_position());
+            if end_passed {
+                self.calc_next_index(&play_control.begin_bar_position());
+            } else {
+                self.calc_next_index(&play_control.position.bar);
+            }
         } else if self.ensure_sorted() {
             self.calc_next_index(&old_position.bar);
         }
@@ -104,7 +110,11 @@ impl MidiChannel {
                     count += 1;
                     hub.send(settings, speed, next);
                 } else {
-                    break;
+                    if next.bar_position().bar_ordinal < play_control.begin_bar_ordinal {
+                        self.next_index += 1;
+                    } else {
+                        break;
+                    }
                 }
             } else {
                 break;
@@ -261,6 +271,7 @@ impl MidiState {
                     &old_position,
                     &self.play_control,
                     tick_result.end_passed,
+                    tick_result.jumped,
                 );
             }
         }

crates/notation_midi/src/wasm/midi_synth.rs

@@ -7,6 +7,8 @@ use notation_model::prelude::{Entry, PlaySpeed};
 pub struct MidiSynth {}
 
 impl MidiSynth {
+    pub const VOLUME_FACTOR: f32 = 0.8; //The sound in browser is a bit too loud
+
     pub fn try_new() -> Option<MidiSynth> {
         Some(MidiSynth {})
     }
@@ -33,7 +35,7 @@ impl MidiSynth {
                 channel.into(),
                 key_number.into(),
                 speed.calc_seconds(msg.entry.tied_units()),
-                u8::from(velocity) as f32 / 128.0,
+                u8::from(velocity) as f32 / 128.0 * Self::VOLUME_FACTOR,
             )),
             _ => Err("NOT_IMPLEMENTED".to_owned()),
         }

crates/notation_model/src/play/play_control.rs

@@ -125,6 +125,11 @@ impl PlayControl {
     }
     pub fn tick(&mut self, jumped: bool, delta_seconds: f32) -> TickResult {
         if self.play_state.is_playing() {
+            let mut jumped = jumped;
+            if self.position.bar.bar_ordinal < self.begin_bar_ordinal || self.position.bar.bar_ordinal > self.end_bar_ordinal {
+                self.position.set_in_bar(self.begin_bar_ordinal, Units(0.0));
+                jumped = true;
+            }
             let delta_units = self.play_speed.calc_units(delta_seconds);
             self.position.tick(delta_units);
             let end_passed = self.position.bar.bar_ordinal > self.end_bar_ordinal;