summaryrefslogtreecommitdiff
path: root/tmk_core/protocol
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-01-20 00:06:52 -0500
committerJack Humbert <jack.humb@gmail.com>2016-01-20 00:06:52 -0500
commiteb61700912f1713ba27d34c23d7f07be66ee6513 (patch)
tree7781c85a3e67a3af34a31a09d6736f07b6a492fe /tmk_core/protocol
parent6e3c36360ed291b9ca2bd014571236308a933d0c (diff)
downloadqmk_firmware-eb61700912f1713ba27d34c23d7f07be66ee6513.tar.gz
qmk_firmware-eb61700912f1713ba27d34c23d7f07be66ee6513.zip
better integrations
Diffstat (limited to 'tmk_core/protocol')
-rw-r--r--tmk_core/protocol/lufa/lufa.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index f04790f4e8..5d40dcf7b2 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -52,8 +52,8 @@
#include "descriptor.h"
#include "lufa.h"
-#ifdef MIDI_ENABLE
- #include <beeps.h>
+#ifdef AUDIO_ENABLE
+ #include <audio.h>
#endif
#ifdef BLUETOOTH_ENABLE
@@ -946,6 +946,8 @@ int main(void)
#ifdef MIDI_ENABLE
void fallthrough_callback(MidiDevice * device,
uint16_t cnt, uint8_t byte0, uint8_t byte1, uint8_t byte2){
+
+#ifdef AUDIO_ENABLE
if (cnt == 3) {
switch (byte0 & 0xF0) {
case MIDI_NOTEON:
@@ -959,6 +961,7 @@ void fallthrough_callback(MidiDevice * device,
if (byte0 == MIDI_STOP) {
stop_all_notes();
}
+#endif
}
void cc_callback(MidiDevice * device,