浏览代码

Working on MP3 support

pull/579/head
Ray 6 年前
父节点
当前提交
6e812cf147
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 二进制
      examples/audio/resources/applause.mp3
  2. +4
    -4
      src/audio.c
  3. +1
    -1
      src/config.h

二进制
examples/audio/resources/applause.mp3 查看文件


+ 4
- 4
src/audio.c 查看文件

@ -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);
o">//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(o">&music->ctxMp3, samplesCount*music->stream.channels, (float *)pcm);
} break; } break;
#endif #endif

+ 1
- 1
src/config.h 查看文件

@ -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
o">//#define SUPPORT_FILEFORMAT_MP3 1 cp">#define SUPPORT_FILEFORMAT_MP3 1
//------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------

||||||
x
 
000:0
正在加载...
取消
保存