Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

1 files changed, 6 insertions, 1 deletions

diff --git a/quantum/audio.h b/quantum/audio.h
index e1bc23ffed..05d314c940 100644
--- a/quantum/audio.h
+++ b/quantum/audio.h
@@ -3,6 +3,7 @@
 #include <avr/io.h>
 #include <util/delay.h>
 #include "musical_notes.h"
+#include "song_list.h"
 
 #ifndef AUDIO_H
 #define AUDIO_H
@@ -24,8 +25,12 @@ void play_note(double freq, int vol);
 void stop_note(double freq);
 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);
+void play_notes(float (*np)[][2], uint8_t n_count, bool n_repeat, float n_rest);
 
+void set_timbre(float timbre);
+void set_tempo(float tempo);
+void increase_tempo(uint8_t tempo_change);
+void decrease_tempo(uint8_t tempo_change);
 
 #define SCALE (int []){ 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), \