From c426f683798dacc506a1cf3035de6df9947446d4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 6 Aug 2017 16:40:55 +0200 Subject: [PATCH] C89 buildfix --- libretro-common/audio/audio_mixer.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c index fc3bcca370..57567f8b8f 100644 --- a/libretro-common/audio/audio_mixer.c +++ b/libretro-common/audio/audio_mixer.c @@ -735,6 +735,8 @@ static void audio_mixer_mix_mod(float* buffer, size_t num_frames, float volume) { int i; + float samplef = 0.0f; + int samplei = 0; unsigned temp_samples = 0; unsigned buf_free = num_frames * 2; int* pcm = NULL; @@ -742,7 +744,9 @@ static void audio_mixer_mix_mod(float* buffer, size_t num_frames, if (voice->types.mod.position == voice->types.mod.samples) { again: - temp_samples = replay_get_audio( voice->types.mod.stream, voice->types.mod.buffer ); + temp_samples = replay_get_audio( + voice->types.mod.stream, voice->types.mod.buffer ); + temp_samples *= 2; /* stereo */ if (temp_samples == 0) @@ -770,15 +774,13 @@ again: } pcm = voice->types.mod.buffer + voice->types.mod.position; - float samplef = 0.0f; - int samplei = 0; if (voice->types.mod.samples < buf_free) { for (i = voice->types.mod.samples; i != 0; i--) { - samplei = *pcm++ * volume; - samplef = (float)((int)samplei + 32768) / 65535.0f; - samplef = samplef * 2.0f - 1.0f; + samplei = *pcm++ * volume; + samplef = (float)((int)samplei + 32768) / 65535.0f; + samplef = samplef * 2.0f - 1.0f; *buffer++ = samplef; } @@ -790,9 +792,9 @@ again: int i; for (i = buf_free; i != 0; --i ) { - samplei = *pcm++ * volume; - samplef = (float)((int)samplei + 32768) / 65535.0f; - samplef = samplef * 2.0f - 1.0f; + samplei = *pcm++ * volume; + samplef = (float)((int)samplei + 32768) / 65535.0f; + samplef = samplef * 2.0f - 1.0f; *buffer++ = samplef; }