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/process_keycode/process_music.h | |
parent | 25f2295ba88627521bed63ec4e5412b983626901 (diff) | |
parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) |
Merge branch 'master' into default_atreus_layout
Diffstat (limited to 'quantum/process_keycode/process_music.h')
-rw-r--r-- | quantum/process_keycode/process_music.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h index 318b3e3875..a36514a44f 100644 --- a/quantum/process_keycode/process_music.h +++ b/quantum/process_keycode/process_music.h @@ -3,6 +3,8 @@ #include "quantum.h" +#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) + bool process_music(uint16_t keycode, keyrecord_t *record); bool is_music_on(void); @@ -10,9 +12,9 @@ void music_toggle(void); void music_on(void); void music_off(void); -void audio_on_user(void); void music_on_user(void); void music_scale_user(void); +void music_all_notes_off(void); void matrix_scan_music(void); @@ -24,4 +26,6 @@ void matrix_scan_music(void); 0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), } #endif +#endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) + #endif
\ No newline at end of file |