From a2f2a882cb97b50775e42a506dc8f424c1c36ef4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Jun 2020 21:06:21 +0200 Subject: [PATCH] Cleanups --- libretro-common/audio/audio_mix.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/libretro-common/audio/audio_mix.c b/libretro-common/audio/audio_mix.c index 0297a2c3df..c55f7a0b84 100644 --- a/libretro-common/audio/audio_mix.c +++ b/libretro-common/audio/audio_mix.c @@ -113,25 +113,19 @@ void audio_mix_free_chunk(audio_chunk_t *chunk) audio_chunk_t* audio_mix_load_wav_file(const char *path, int sample_rate) { int sample_size; - int64_t len = 0; - void *buf = NULL; - audio_chunk_t *chunk = (audio_chunk_t*)malloc(sizeof(*chunk)); + int64_t len = 0; + void *buf = NULL; + audio_chunk_t *chunk = (audio_chunk_t*)malloc(sizeof(*chunk)); if (!chunk) return NULL; - if (!filestream_read_file(path, &buf, &len)) - { - printf("Could not open WAV file for reading.\n"); - goto error; - } - - chunk->buf = buf; + chunk->buf = NULL; chunk->upsample_buf = NULL; chunk->float_buf = NULL; chunk->float_resample_buf = NULL; chunk->resample_buf = NULL; - chunk->len = len; + chunk->len = 0; chunk->resample_len = 0; chunk->rwav = (rwav_t*)malloc(sizeof(rwav_t)); chunk->sample_rate = sample_rate; @@ -147,6 +141,15 @@ audio_chunk_t* audio_mix_load_wav_file(const char *path, int sample_rate) chunk->rwav->subchunk2size = 0; chunk->rwav->samples = NULL; + if (!filestream_read_file(path, &buf, &len)) + { + printf("Could not open WAV file for reading.\n"); + goto error; + } + + chunk->buf = buf; + chunk->len = len; + if (rwav_load(chunk->rwav, chunk->buf, chunk->len) == RWAV_ITERATE_ERROR) { printf("error: could not load WAV file\n");