diff options
| author | Joshua T <joshua@sonofone.net> | 2016-07-26 01:49:24 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-07-26 01:49:24 -0500 |
| commit | 5607b716ba0ec7002f29244f24aa8999b9511061 (patch) | |
| tree | bdd1255faa369d1e9bf1959d96b25ed857916ff5 /quantum/process_keycode/process_music.c | |
| parent | 876a6bdd4ca9033972d0a2d8c0c563cc6d7d9e7e (diff) | |
| parent | f9aadd17e8fce17fe1e135cf8022e71a35ae5adf (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'quantum/process_keycode/process_music.c')
| -rw-r--r-- | quantum/process_keycode/process_music.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c index c8f3ddb900..2d52e47a72 100644 --- a/quantum/process_keycode/process_music.c +++ b/quantum/process_keycode/process_music.c @@ -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; |