aboutsummaryrefslogtreecommitdiff
path: root/quantum/process_keycode/process_music.h
diff options
context:
space:
mode:
authorHugh Enxing <henxing@draper.com>2017-03-28 12:11:49 -0400
committerHugh Enxing <henxing@draper.com>2017-03-28 12:11:49 -0400
commit3fdc45b4e9581c823ac09545241241e0c6d3f313 (patch)
treef17c050672086233a2de4e4c8d0ba72c5bd87841 /quantum/process_keycode/process_music.h
parent25f2295ba88627521bed63ec4e5412b983626901 (diff)
parent5e4daf1c6db980fad269fe7b013205008bfe701e (diff)
downloadqmk_firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.tar.gz
qmk_firmware-3fdc45b4e9581c823ac09545241241e0c6d3f313.zip
Merge branch 'master' into default_atreus_layout
Diffstat (limited to 'quantum/process_keycode/process_music.h')
-rw-r--r--quantum/process_keycode/process_music.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h
index 318b3e387..a36514a44 100644
--- a/quantum/process_keycode/process_music.h
+++ b/quantum/process_keycode/process_music.h
@@ -3,6 +3,8 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
7
6bool process_music(uint16_t keycode, keyrecord_t *record); 8bool process_music(uint16_t keycode, keyrecord_t *record);
7 9
8bool is_music_on(void); 10bool is_music_on(void);
@@ -10,9 +12,9 @@ void music_toggle(void);
10void music_on(void); 12void music_on(void);
11void music_off(void); 13void music_off(void);
12 14
13void audio_on_user(void);
14void music_on_user(void); 15void music_on_user(void);
15void music_scale_user(void); 16void music_scale_user(void);
17void music_all_notes_off(void);
16 18
17void matrix_scan_music(void); 19void matrix_scan_music(void);
18 20
@@ -24,4 +26,6 @@ void matrix_scan_music(void);
24 0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), } 26 0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), }
25#endif 27#endif
26 28
29#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))
30
27#endif \ No newline at end of file 31#endif \ No newline at end of file