aboutsummaryrefslogtreecommitdiff
path: root/quantum/audio/audio.h
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-04-22 01:04:13 -0400
committerJack Humbert <jack.humb@gmail.com>2016-04-22 01:04:13 -0400
commita8086126fecbdce1c192036cf1011329d406949d (patch)
treeb00149e3808780b8a64fdd7240c207cd95028261 /quantum/audio/audio.h
parentb1900c8dde2a68e87aaabd84280a99bf6658ea9f (diff)
parent082a0f313d8c842a5de7bae30ec8a3597e35880b (diff)
downloadqmk_firmware-a8086126fecbdce1c192036cf1011329d406949d.tar.gz
qmk_firmware-a8086126fecbdce1c192036cf1011329d406949d.zip
Merge remote-tracking branch 'origin/master'
# Conflicts: # quantum/audio/voices.c
Diffstat (limited to 'quantum/audio/audio.h')
-rw-r--r--quantum/audio/audio.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/quantum/audio/audio.h b/quantum/audio/audio.h
index d1ccfdb82..89769507e 100644
--- a/quantum/audio/audio.h
+++ b/quantum/audio/audio.h
@@ -50,8 +50,8 @@ void decrease_vibrato_strength(float change);
50// Polyphony functions 50// Polyphony functions
51 51
52void set_polyphony_rate(float rate); 52void set_polyphony_rate(float rate);
53void enable_polyphony(); 53void enable_polyphony(void);
54void disable_polyphony(); 54void disable_polyphony(void);
55void increase_polyphony_rate(float change); 55void increase_polyphony_rate(float change);
56void decrease_polyphony_rate(float change); 56void decrease_polyphony_rate(float change);
57 57
@@ -61,7 +61,7 @@ void set_tempo(float tempo);
61void increase_tempo(uint8_t tempo_change); 61void increase_tempo(uint8_t tempo_change);
62void decrease_tempo(uint8_t tempo_change); 62void decrease_tempo(uint8_t tempo_change);
63 63
64void audio_init(); 64void audio_init(void);
65 65
66#ifdef PWM_AUDIO 66#ifdef PWM_AUDIO
67void play_sample(uint8_t * s, uint16_t l, bool r); 67void play_sample(uint8_t * s, uint16_t l, bool r);