Fix Audio code when resetting keyboard

I incorrectly disabled a bunch of code that shouldn't have been disabled.  This should only disable music mode stuff, not general audio.
This commit is contained in:
Drashna Jaelre 2018-07-29 21:24:42 -07:00 committed by Jack Humbert
parent 23d68d0ba1
commit ef5b161bb5

View file

@ -147,8 +147,10 @@ void reset_keyboard(void) {
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC) #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
process_midi_all_notes_off(); process_midi_all_notes_off();
#endif #endif
#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE) #ifdef AUDIO_ENABLE
#ifndef NO_MUSIC_MODE
music_all_notes_off(); music_all_notes_off();
#endif
uint16_t timer_start = timer_read(); uint16_t timer_start = timer_read();
PLAY_SONG(goodbye_song); PLAY_SONG(goodbye_song);
shutdown_user(); shutdown_user();
@ -931,7 +933,7 @@ uint8_t rgb_matrix_task_counter = 0;
#endif #endif
void matrix_scan_quantum() { void matrix_scan_quantum() {
#if defined(AUDIO_ENABLE) #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
matrix_scan_music(); matrix_scan_music();
#endif #endif