diff options
| author | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
|---|---|---|
| committer | Ole Anders <git@swoy.org> | 2017-03-28 15:55:33 +0200 |
| commit | 62faa20ef6ddab7dacc74123b2253cf25b5c20f7 (patch) | |
| tree | 281ae30283f7491b2529465da4897dc2ddd7088c /quantum/process_keycode/process_music.h | |
| parent | d5ee0194abf5cc9df4086a89ad78cf188352028a (diff) | |
| parent | 5e4daf1c6db980fad269fe7b013205008bfe701e (diff) | |
| download | qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.gz qmk_firmware-62faa20ef6ddab7dacc74123b2253cf25b5c20f7.tar.xz | |
Merge remote-tracking branch 'refs/remotes/qmk/master'
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 318b3e387..a36514a44 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 |