diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-03-28 09:26:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 09:26:54 -0400 |
| commit | 7e37daa2ce6edad82de3835384176b51a8081537 (patch) | |
| tree | 58f349edb063667c9ae0affd99cec2bf7a7f93cb /quantum/quantum.c | |
| parent | 216f669276b30393fb35a409011ccdad8b521156 (diff) | |
| parent | 0734f569409974624b40735fcd498dac9adba2d2 (diff) | |
| download | firmware-7e37daa2ce6edad82de3835384176b51a8081537.tar.gz firmware-7e37daa2ce6edad82de3835384176b51a8081537.tar.bz2 firmware-7e37daa2ce6edad82de3835384176b51a8081537.zip | |
Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes
Flesh out MIDI support
Diffstat (limited to 'quantum/quantum.c')
| -rw-r--r-- | quantum/quantum.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c index 807a7084a..5a9e771a9 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -98,8 +98,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { void reset_keyboard(void) { clear_keyboard(); -#ifdef AUDIO_ENABLE - stop_all_notes(); +#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_ENABLE_BASIC)) + music_all_notes_off(); shutdown_user(); #endif wait_ms(250); @@ -153,10 +153,13 @@ bool process_record_quantum(keyrecord_t *record) { if (!( process_record_kb(keycode, record) && - #ifdef MIDI_ENABLE + #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED) process_midi(keycode, record) && #endif #ifdef AUDIO_ENABLE + process_audio(keycode, record) && + #endif + #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) process_music(keycode, record) && #endif #ifdef TAP_DANCE_ENABLE |