diff options
author | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-25 09:48:58 +0200 |
---|---|---|
committer | Fabian Topfstedt <topfstedt@schneevonmorgen.com> | 2017-07-25 09:48:58 +0200 |
commit | 4ee571b25734561ce44c0f22e9bff72f4a822cc3 (patch) | |
tree | 51f3b6d438e10df6f716ce58268d29319104fb8c /quantum/audio/audio.h | |
parent | ee43856ff7ba37ea89d1a8a4700efba4e4f69571 (diff) | |
parent | cefc09ae7dd88cd6b92412881888404da1abdfcb (diff) | |
download | qmk_firmware-4ee571b25734561ce44c0f22e9bff72f4a822cc3.tar.gz qmk_firmware-4ee571b25734561ce44c0f22e9bff72f4a822cc3.zip |
Merge https://github.com/qmk/qmk_firmware
Diffstat (limited to 'quantum/audio/audio.h')
-rw-r--r-- | quantum/audio/audio.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h index 27fdc2ab63..79e0da2295 100644 --- a/quantum/audio/audio.h +++ b/quantum/audio/audio.h @@ -86,7 +86,7 @@ void play_sample(uint8_t * s, uint16_t l, bool r); void play_note(float freq, int vol); void stop_note(float freq); void stop_all_notes(void); -void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest); +void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat); #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), \ 0 + (12*1), 2 + (12*1), 4 + (12*1), 5 + (12*1), 7 + (12*1), 9 + (12*1), 11 + (12*1), \ @@ -98,8 +98,10 @@ void play_notes(float (*np)[][2], uint16_t n_count, bool n_repeat, float n_rest) // length. This works around the limitation of C's sizeof operation on pointers. // The global float array for the song must be used here. #define NOTE_ARRAY_SIZE(x) ((int16_t)(sizeof(x) / (sizeof(x[0])))) -#define PLAY_NOTE_ARRAY(note_array, note_repeat, note_rest_style) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat), (note_rest_style)); - +#define PLAY_NOTE_ARRAY(note_array, note_repeat, deprecated_arg) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), (note_repeat)); \ + _Pragma ("message \"'PLAY_NOTE_ARRAY' macro is deprecated\"") +#define PLAY_SONG(note_array) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), false) +#define PLAY_LOOP(note_array) play_notes(¬e_array, NOTE_ARRAY_SIZE((note_array)), true) bool is_playing_notes(void); |