diff options
author | IBNobody <ibnobody@gmail.com> | 2016-04-16 22:10:18 -0500 |
---|---|---|
committer | IBNobody <ibnobody@gmail.com> | 2016-04-16 22:10:18 -0500 |
commit | 45f10b4c4b308226fa1568277654a13853a03ab4 (patch) | |
tree | 640e6e7f414d89490fbbde058da1da0d1be98411 /quantum/audio.h | |
parent | 12a9b2b9aeb59a16602374dab202df2bbe256be4 (diff) |
Fixed how note arrays are used.
Diffstat (limited to 'quantum/audio.h')
-rw-r--r-- | quantum/audio.h | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/quantum/audio.h b/quantum/audio.h index 65a6f9434d..762c980643 100644 --- a/quantum/audio.h +++ b/quantum/audio.h @@ -4,6 +4,9 @@ #include <util/delay.h> #include "musical_notes.h" +#ifndef AUDIO_H +#define AUDIO_H + typedef union { uint8_t raw; struct { @@ -19,6 +22,16 @@ void audio_off(void); void play_sample(uint8_t * s, uint16_t l, bool r); void play_note(double freq, int vol); void stop_note(double freq); -void stop_all_notes(); -void init_notes(); +void stop_all_notes(void); +void init_notes(void); void play_notes(float (*np)[][2], uint8_t n_length, bool n_repeat, float n_rest); + + +// These macros are used to allow play_notes to play an array of indeterminate +// 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) ((int)(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)); + + +#endif
\ No newline at end of file |