From 861a61905394e09daf8138f481025423baf20dfe Mon Sep 17 00:00:00 2001 From: Ray Date: Tue, 3 Sep 2019 23:24:09 +0200 Subject: [PATCH] Review dr_flac usage Replaced DEPRECATED functions --- src/config.h | 4 ++-- src/raudio.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config.h b/src/config.h index 398b5e9ad..250b702a1 100644 --- a/src/config.h +++ b/src/config.h @@ -133,8 +133,8 @@ #define SUPPORT_FILEFORMAT_OGG 1 #define SUPPORT_FILEFORMAT_XM 1 #define SUPPORT_FILEFORMAT_MOD 1 -//#define SUPPORT_FILEFORMAT_FLAC 1 -#define SUPPORT_FILEFORMAT_MP3 1 +#define SUPPORT_FILEFORMAT_FLAC 1 +#define SUPPORT_FILEFORMAT_MP3 1 //------------------------------------------------------------------------------------ diff --git a/src/raudio.c b/src/raudio.c index 2edf660a3..1f945be5e 100644 --- a/src/raudio.c +++ b/src/raudio.c @@ -1366,7 +1366,7 @@ void StopMusicStream(Music music) case MUSIC_AUDIO_OGG: stb_vorbis_seek_start((stb_vorbis *)music.ctxData); break; #endif #if defined(SUPPORT_FILEFORMAT_FLAC) - case MUSIC_AUDIO_FLAC: drflac_seek_to_sample((drflac *)music.ctxData, 0) break; + case MUSIC_AUDIO_FLAC: drflac_seek_to_pcm_frame((drflac *)music.ctxData, 0); break; #endif #if defined(SUPPORT_FILEFORMAT_MP3) case MUSIC_AUDIO_MP3: drmp3_seek_to_pcm_frame((drmp3 *)music.ctxData, 0); break; @@ -1416,7 +1416,7 @@ void UpdateMusicStream(Music music) case MUSIC_AUDIO_FLAC: { // NOTE: Returns the number of samples to process (not required) - drflac_read_s16((drflac *)music.ctxData, samplesCount, (short *)pcm); + drflac_read_pcm_frames_s16((drflac *)music.ctxData, samplesCount, (short *)pcm); } break; #endif @@ -1928,7 +1928,7 @@ static Wave LoadFLAC(const char *fileName) // Decode an entire FLAC file in one go uint64_t totalSampleCount; - wave.data = drflac_open_and_decode_file_s16(fileName, &wave.channels, &wave.sampleRate, &totalSampleCount); + wave.data = drflac_open_file_and_read_pcm_frames_s16(fileName, &wave.channels, &wave.sampleRate, &totalSampleCount); wave.sampleCount = (unsigned int)totalSampleCount; wave.sampleSize = 16;