diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-05-04 08:03:25 +0200 |
| commit | 660511f05007b7299a8ceceba02d92ab33574ce1 (patch) | |
| tree | a36d0f69f87f0045f5a3c015ddd632cba3c0e37c /quantum/audio/voices.c | |
| parent | 507db3ab13b7d058e683a6729f81ee214c1a4f17 (diff) | |
| parent | 31a697bc054c97c5ef168c5fd4633bb247cc5d7b (diff) | |
| download | firmware-660511f05007b7299a8ceceba02d92ab33574ce1.tar.gz firmware-660511f05007b7299a8ceceba02d92ab33574ce1.tar.bz2 firmware-660511f05007b7299a8ceceba02d92ab33574ce1.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'quantum/audio/voices.c')
| -rw-r--r-- | quantum/audio/voices.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/quantum/audio/voices.c b/quantum/audio/voices.c index d2316ba1b..6d4172a06 100644 --- a/quantum/audio/voices.c +++ b/quantum/audio/voices.c @@ -1,6 +1,6 @@ #include "voices.h" +#include "audio.h" #include "stdlib.h" -#include "vibrato_lut.h" // these are imported from audio.c extern uint16_t envelope_index; @@ -109,7 +109,7 @@ float voice_envelope(float frequency) { case 0 ... VOICE_VIBRATO_DELAY: break; default: - frequency = frequency * VIBRATO_LUT[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)]; + frequency = frequency * vibrato_lut[(int)fmod((((float)compensated_index - (VOICE_VIBRATO_DELAY + 1))/1000*VOICE_VIBRATO_SPEED), VIBRATO_LUT_LENGTH)]; break; } break; @@ -160,4 +160,6 @@ float voice_envelope(float frequency) { } return frequency; -}
\ No newline at end of file +} + + |