UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working on MP3 support

Browse source
This commit is contained in:
Ray 2018-07-19 23:15:46 +02:00
parent 103044926b
commit 6e812cf147
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
examples/audio/resources/applause.mp3 Normal file
View file

Binary file not shown.

8
src/audio.c
View file

@ -1373,13 +1373,13 @@ Music LoadMusicStream(const char *fileName)
#if defined(SUPPORT_FILEFORMAT_MP3) #if defined(SUPPORT_FILEFORMAT_MP3)
else if (IsFileExtension(fileName, ".mp3")) else if (IsFileExtension(fileName, ".mp3"))
{ {
drmp3_init_file(&music->ctxMp3, fileName, NULL) drmp3_init_file(&music->ctxMp3, fileName, NULL);
if (music->ctxMp3 == NULL) TraceLog(LOG_WARNING, "[%s] MP3 audio file could not be opened", fileName); if (music->ctxMp3.framesRemaining <= 0) TraceLog(LOG_WARNING, "[%s] MP3 audio file could not be opened", fileName);
else else
{ {
music->stream = InitAudioStream(music->ctxMp3.sampleRate, 16, music->ctxMp3.channels); music->stream = InitAudioStream(music->ctxMp3.sampleRate, 16, music->ctxMp3.channels);
//music->totalSamples = (unsigned int)music->ctxMp3.totalSampleCount/music->ctxMp3.channels; //TODO! music->totalSamples = (unsigned int)music->ctxMp3.framesRemaining*music->ctxMp3.channels;
music->samplesLeft = music->totalSamples; music->samplesLeft = music->totalSamples;
music->ctxType = MUSIC_AUDIO_MP3; music->ctxType = MUSIC_AUDIO_MP3;
music->loopCount = -1; // Infinite loop by default music->loopCount = -1; // Infinite loop by default
@ -1594,7 +1594,7 @@ void UpdateMusicStream(Music music)
case MUSIC_AUDIO_MP3: case MUSIC_AUDIO_MP3:
{ {
// NOTE: Returns the number of samples to process // NOTE: Returns the number of samples to process
unsigned int numSamplesMp3 = (unsigned int)drmp3_read_f32(music->ctxMp3, samplesCount*music->stream.channels, (short *)pcm); unsigned int numSamplesMp3 = (unsigned int)drmp3_read_f32(&music->ctxMp3, samplesCount*music->stream.channels, (float *)pcm);
} break; } break;
#endif #endif

2
src/config.h
View file

@ -124,7 +124,7 @@
#define SUPPORT_FILEFORMAT_XM 1 #define SUPPORT_FILEFORMAT_XM 1
#define SUPPORT_FILEFORMAT_MOD 1 #define SUPPORT_FILEFORMAT_MOD 1
//#define SUPPORT_FILEFORMAT_FLAC 1 //#define SUPPORT_FILEFORMAT_FLAC 1
//#define SUPPORT_FILEFORMAT_MP3 1 #define SUPPORT_FILEFORMAT_MP3 1
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------