]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
ensure there's a recording to play before playing; also enables the LGUI button to...
authorRobert Dale <robdale@gmail.com>
Sun, 24 Jul 2016 14:00:39 +0000 (10:00 -0400)
committerRobert Dale <robdale@gmail.com>
Sun, 24 Jul 2016 14:00:39 +0000 (10:00 -0400)
quantum/process_keycode/process_music.c

index c8f3ddb9001c25186eeeba05cbb15440c3a39ee4..2d52e47a728811ae6d65c7bef0fad1390befcaf0 100644 (file)
@@ -6,6 +6,7 @@ int offset = 7;
 
 // music sequencer
 static bool music_sequence_recording = false;
+static bool music_sequence_recorded = false;
 static bool music_sequence_playing = false;
 static float music_sequence[16] = {0};
 static uint8_t music_sequence_count = 0;
@@ -77,6 +78,7 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
       if (keycode == KC_LCTL && record->event.pressed) { // Start recording
         stop_all_notes();
         music_sequence_recording = true;
+        music_sequence_recorded = false;
         music_sequence_playing = false;
         music_sequence_count = 0;
         return false;
@@ -84,12 +86,15 @@ bool process_music(uint16_t keycode, keyrecord_t *record) {
 
       if (keycode == KC_LALT && record->event.pressed) { // Stop recording/playing
         stop_all_notes();
+        if (music_sequence_recording) { // was recording
+          music_sequence_recorded = true;
+        }
         music_sequence_recording = false;
         music_sequence_playing = false;
         return false;
       }
 
-      if (keycode == KC_LGUI && record->event.pressed) { // Start playing
+      if (keycode == KC_LGUI && record->event.pressed && music_sequence_recorded) { // Start playing
         stop_all_notes();
         music_sequence_recording = false;
         music_sequence_playing = true;