diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-04-22 01:04:13 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2016-04-22 01:04:13 -0400 |
| commit | a8086126fecbdce1c192036cf1011329d406949d (patch) | |
| tree | b00149e3808780b8a64fdd7240c207cd95028261 /quantum/audio/audio.h | |
| parent | b1900c8dde2a68e87aaabd84280a99bf6658ea9f (diff) | |
| parent | 082a0f313d8c842a5de7bae30ec8a3597e35880b (diff) | |
| download | qmk_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.h | 6 |
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 | ||
| 52 | void set_polyphony_rate(float rate); | 52 | void set_polyphony_rate(float rate); |
| 53 | void enable_polyphony(); | 53 | void enable_polyphony(void); |
| 54 | void disable_polyphony(); | 54 | void disable_polyphony(void); |
| 55 | void increase_polyphony_rate(float change); | 55 | void increase_polyphony_rate(float change); |
| 56 | void decrease_polyphony_rate(float change); | 56 | void decrease_polyphony_rate(float change); |
| 57 | 57 | ||
| @@ -61,7 +61,7 @@ void set_tempo(float tempo); | |||
| 61 | void increase_tempo(uint8_t tempo_change); | 61 | void increase_tempo(uint8_t tempo_change); |
| 62 | void decrease_tempo(uint8_t tempo_change); | 62 | void decrease_tempo(uint8_t tempo_change); |
| 63 | 63 | ||
| 64 | void audio_init(); | 64 | void audio_init(void); |
| 65 | 65 | ||
| 66 | #ifdef PWM_AUDIO | 66 | #ifdef PWM_AUDIO |
| 67 | void play_sample(uint8_t * s, uint16_t l, bool r); | 67 | void play_sample(uint8_t * s, uint16_t l, bool r); |
