diff options
author | skullY <skullydazed@gmail.com> | 2019-08-30 11:19:03 -0700 |
---|---|---|
committer | skullydazed <skullydazed@users.noreply.github.com> | 2019-08-30 15:01:52 -0700 |
commit | b624f32f944acdc59dcb130674c09090c5c404cb (patch) | |
tree | bc13adbba137d122d9a2c2fb2fafcbb08ac10e25 /quantum/process_keycode/process_music.h | |
parent | 61af76a10d00aba185b8338604171de490a13e3b (diff) | |
download | qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.tar.gz qmk_firmware-b624f32f944acdc59dcb130674c09090c5c404cb.zip |
clang-format changes
Diffstat (limited to 'quantum/process_keycode/process_music.h')
-rw-r--r-- | quantum/process_keycode/process_music.h | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/quantum/process_keycode/process_music.h b/quantum/process_keycode/process_music.h index f6753d4f2..292bc5374 100644 --- a/quantum/process_keycode/process_music.h +++ b/quantum/process_keycode/process_music.h | |||
@@ -21,18 +21,11 @@ | |||
21 | 21 | ||
22 | #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) | 22 | #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) |
23 | 23 | ||
24 | enum music_modes { | 24 | enum music_modes { MUSIC_MODE_CHROMATIC, MUSIC_MODE_GUITAR, MUSIC_MODE_VIOLIN, MUSIC_MODE_MAJOR, NUMBER_OF_MODES }; |
25 | MUSIC_MODE_CHROMATIC, | ||
26 | MUSIC_MODE_GUITAR, | ||
27 | MUSIC_MODE_VIOLIN, | ||
28 | MUSIC_MODE_MAJOR, | ||
29 | NUMBER_OF_MODES | ||
30 | }; | ||
31 | 25 | ||
32 | 26 | # ifdef MUSIC_MAP | |
33 | #ifdef MUSIC_MAP | 27 | extern const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS]; |
34 | extern const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS]; | 28 | # endif |
35 | #endif | ||
36 | 29 | ||
37 | bool process_music(uint16_t keycode, keyrecord_t *record); | 30 | bool process_music(uint16_t keycode, keyrecord_t *record); |
38 | 31 | ||
@@ -58,14 +51,11 @@ bool music_mask(uint16_t keycode); | |||
58 | bool music_mask_kb(uint16_t keycode); | 51 | bool music_mask_kb(uint16_t keycode); |
59 | bool music_mask_user(uint16_t keycode); | 52 | bool music_mask_user(uint16_t keycode); |
60 | 53 | ||
61 | #ifndef SCALE | 54 | # ifndef SCALE |
62 | #define SCALE (int8_t []){ 0 + (12*0), 2 + (12*0), 4 + (12*0), 5 + (12*0), 7 + (12*0), 9 + (12*0), 11 + (12*0), \ | 55 | # define SCALE \ |
63 | 0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \ | 56 | (int8_t[]) { 0 + (12 * 0), 2 + (12 * 0), 4 + (12 * 0), 5 + (12 * 0), 7 + (12 * 0), 9 + (12 * 0), 11 + (12 * 0), 0 + (12 * 1), 2 + (12 * 1), 4 + (12 * 1), 5 + (12 * 1), 7 + (12 * 1), 9 + (12 * 1), 11 + (12 * 1), 0 + (12 * 2), 2 + (12 * 2), 4 + (12 * 2), 5 + (12 * 2), 7 + (12 * 2), 9 + (12 * 2), 11 + (12 * 2), 0 + (12 * 3), 2 + (12 * 3), 4 + (12 * 3), 5 + (12 * 3), 7 + (12 * 3), 9 + (12 * 3), 11 + (12 * 3), 0 + (12 * 4), 2 + (12 * 4), 4 + (12 * 4), 5 + (12 * 4), 7 + (12 * 4), 9 + (12 * 4), 11 + (12 * 4), } |
64 | 0 + (12*2), 2 + (12*2), 4 + (12*2), 5 + (12*2), 7 + (12*2), 9 + (12*2), 11 + (12*2), \ | 57 | # endif |
65 | 0 + (12*3), 2 + (12*3), 4 + (12*3), 5 + (12*3), 7 + (12*3), 9 + (12*3), 11 + (12*3), \ | ||
66 | 0 + (12*4), 2 + (12*4), 4 + (12*4), 5 + (12*4), 7 + (12*4), 9 + (12*4), 11 + (12*4), } | ||
67 | #endif | ||
68 | 58 | ||
69 | #endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) | 59 | #endif // defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) |
70 | 60 | ||
71 | #endif | 61 | #endif |