always play click sound for first empty bar, and always play guitar sound when seeking

Author: yjpark

crates/notation_bevy/src/viewer/control_view.rs

@@ -200,6 +200,8 @@ impl ControlView {
                 });
                 if ui.button("Reset Audio").clicked() {
                     let default = MidiSettings::default();
+                    midi_settings.click_mute = default.click_mute;
+                    midi_settings.click_velocity = default.click_velocity;
                     midi_settings.vocal_mute = default.vocal_mute;
                     midi_settings.vocal_velocity = default.vocal_velocity;
                     midi_settings.guitar_mute = default.guitar_mute;

crates/notation_midi/src/midi_settings.rs

@@ -30,8 +30,8 @@ impl Default for MidiSettings {
     fn default() -> Self {
         Self {
             bypass_hub: false,
-            click_mute: false,
-            click_velocity: 50,
+            click_mute: true,
+            click_velocity: 100,
             click_octave: Octave::P7,
             vocal_mute: false,
             vocal_velocity: 110,

crates/notation_midi/src/midi_state.rs

@@ -108,23 +108,23 @@ impl MidiChannel {
         if !bypass {
             match &self.track {
                 Some(track) => {
-                    if !is_seeking || track.kind != settings.seeking_track {
-                        match track.kind {
-                            TrackKind::Vocal => {
-                                velocity = if settings.vocal_mute { 0 } else { settings.vocal_velocity };
-                            },
-                            TrackKind::Guitar => {
-                                velocity = if settings.guitar_mute { 0 } else { settings.guitar_velocity };
-                            },
-                            TrackKind::Piano => {
-                                velocity = if settings.piano_mute { 0 } else { settings.piano_velocity };
-                            },
-                            _ => (),
-                        }
+                    let seeking = is_seeking && track.kind == settings.seeking_track;
+                    match track.kind {
+                        TrackKind::Vocal => {
+                            velocity = if !seeking && settings.vocal_mute { 0 } else { settings.vocal_velocity };
+                        },
+                        TrackKind::Guitar => {
+                            velocity = if !seeking && settings.guitar_mute { 0 } else { settings.guitar_velocity };
+                        },
+                        TrackKind::Piano => {
+                            velocity = if !seeking && settings.piano_mute { 0 } else { settings.piano_velocity };
+                        },
+                        _ => (),
                     }
                 },
                 None => {
-                    velocity = if settings.click_mute { 0 } else { settings.click_velocity };
+                    let is_rest = play_control.position.bar.bar_ordinal == 0;
+                    velocity = if !is_rest && settings.click_mute { 0 } else { settings.click_velocity };
                 }
             }
         }