aboutsummaryrefslogtreecommitdiffstats
path: root/quantum/process_keycode/process_music.c
diff options
context:
space:
mode:
authorRobert Dale <robdale@gmail.com>2016-07-24 10:00:39 -0400
committerRobert Dale <robdale@gmail.com>2016-07-24 10:00:39 -0400
commit3ea738e450e9326b0d3ee4192da881cffb4c13c1 (patch)
treeee234c75a0e632a767175a111ab2d1ee948a0537 /quantum/process_keycode/process_music.c
parent8e1d96983aad19b3e4e72ece5db822e92d91342b (diff)
downloadfirmware-3ea738e450e9326b0d3ee4192da881cffb4c13c1.tar.gz
firmware-3ea738e450e9326b0d3ee4192da881cffb4c13c1.tar.bz2
firmware-3ea738e450e9326b0d3ee4192da881cffb4c13c1.zip
ensure there's a recording to play before playing; also enables the LGUI button to play a tone
Diffstat (limited to 'quantum/process_keycode/process_music.c')
-rw-r--r--quantum/process_keycode/process_music.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_music.c b/quantum/process_keycode/process_music.c
index c8f3ddb90..2d52e47a7 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;