diff options
| author | Stephen Christie <undersampled@live.com> | 2016-08-02 22:51:30 -0400 |
|---|---|---|
| committer | Stephen Christie <undersampled@live.com> | 2016-08-02 22:51:30 -0400 |
| commit | bf2b260429dbc015d49d005065a37441c8f15753 (patch) | |
| tree | ff87f04b747ce54870e8fb2a56af205079f9415c /quantum/process_keycode/process_music.c | |
| parent | 0acb394ac41f56895d4287d950a79bca5437a45c (diff) | |
| parent | 79a9e04706919b4cc684f9ee9420ef38470bcd66 (diff) | |
Merge branch 'master' of http://github.com/jackhumbert/qmk_firmware
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; |