diff options
| author | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
|---|---|---|
| committer | Hugh Enxing <henxing@draper.com> | 2017-03-28 12:11:49 -0400 |
| commit | 3fdc45b4e9581c823ac09545241241e0c6d3f313 (patch) | |
| tree | f17c050672086233a2de4e4c8d0ba72c5bd87841 /quantum/quantum.h | |
| parent | 25f2295ba88627521bed63ec4e5412b983626901 (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
Merge branch 'master' into default_atreus_layout
Diffstat (limited to 'quantum/quantum.h')
| -rw-r--r-- | quantum/quantum.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/quantum/quantum.h b/quantum/quantum.h index 259bac3697..1f1bb0afd2 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -35,11 +35,16 @@ extern uint32_t default_layer_state; #ifdef MIDI_ENABLE #include <lufa.h> +#ifdef MIDI_ADVANCED #include "process_midi.h" #endif +#endif // MIDI_ENABLE #ifdef AUDIO_ENABLE - #include "audio.h" + #include "process_audio.h" +#endif + +#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) #include "process_music.h" #endif |