diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-12-10 11:54:36 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-12-10 11:54:36 -0500 |
| commit | e6b91549e36f9d9d20f9857c8a081ad1ecfbfff0 (patch) | |
| tree | ded8dc78f594a09d3eae6a146e17f1262ba16bc9 /quantum/quantum.c | |
| parent | 58898f77e311588e15f78d3f6ed829b6010055d9 (diff) | |
| download | qmk_firmware-e6b91549e36f9d9d20f9857c8a081ad1ecfbfff0.tar.gz qmk_firmware-e6b91549e36f9d9d20f9857c8a081ad1ecfbfff0.zip | |
fixes audio/midi combinations
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index e2280b707..52f19af98 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c | |||
| @@ -132,7 +132,10 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 132 | 132 | ||
| 133 | void reset_keyboard(void) { | 133 | void reset_keyboard(void) { |
| 134 | clear_keyboard(); | 134 | clear_keyboard(); |
| 135 | #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) | 135 | #if defined(MIDI_ENABLE) && defined(MIDI_BASIC) |
| 136 | process_midi_all_notes_off(); | ||
| 137 | #endif | ||
| 138 | #if defined(AUDIO_ENABLE) | ||
| 136 | music_all_notes_off(); | 139 | music_all_notes_off(); |
| 137 | uint16_t timer_start = timer_read(); | 140 | uint16_t timer_start = timer_read(); |
| 138 | PLAY_SONG(goodbye_song); | 141 | PLAY_SONG(goodbye_song); |
