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

Corrected issue with MOD playing

Browse source 
Despite issue is corrected, now module loop doesn't work...
This commit is contained in:
raysan5 2018-12-25 15:18:35 +01:00
parent 96207a8a02
commit 35a6e9a074
2 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/audio/audio_module_playing.c
View file

@ -52,7 +52,7 @@ int main()
circles[i].color = colors[GetRandomValue(0, 13)]; circles[i].color = colors[GetRandomValue(0, 13)];
} }
Music xm = LoadMusicStream("resources/mini1111.xm"); Music xm = LoadMusicStream("resources/chiptun1.mod");
PlayMusicStream(xm); PlayMusicStream(xm);

20
src/audio.c
View file

@ -1176,14 +1176,15 @@ Music LoadMusicStream(const char *fileName)
if (jar_mod_load_file(&music->ctxMod, fileName)) if (jar_mod_load_file(&music->ctxMod, fileName))
{ {
// NOTE: Only stereo is supported for MOD
music->stream = InitAudioStream(48000, 16, 2); music->stream = InitAudioStream(48000, 16, 2);
music->totalSamples = (unsigned int)jar_mod_max_samples(&music->ctxMod); music->totalSamples = (unsigned int)jar_mod_max_samples(&music->ctxMod);
music->samplesLeft = music->totalSamples; music->samplesLeft = music->totalSamples;
music->ctxType = MUSIC_MODULE_MOD; music->ctxType = MUSIC_MODULE_MOD;
music->loopCount = -1; // Infinite loop by default music->loopCount = -1; // Infinite loop by default
TraceLog(LOG_DEBUG, "[%s] MOD number of samples: %i", fileName, music->samplesLeft); TraceLog(LOG_INFO, "[%s] MOD number of samples: %i", fileName, music->samplesLeft);
TraceLog(LOG_DEBUG, "[%s] MOD track length: %11.6f sec", fileName, (float)music->totalSamples/48000.0f); TraceLog(LOG_INFO, "[%s] MOD track length: %11.6f sec", fileName, (float)music->totalSamples/48000.0f);
} }
else musicLoaded = false; else musicLoaded = false;
} }
@ -1345,18 +1346,27 @@ void UpdateMusicStream(Music music)
#if defined(SUPPORT_FILEFORMAT_XM) #if defined(SUPPORT_FILEFORMAT_XM)
case MUSIC_MODULE_XM: case MUSIC_MODULE_XM:
{ {
// NOTE: Internally this function considers 2 channels generation, so samplesCount/2 --> WEIRD // NOTE: Internally this function considers 2 channels generation, so samplesCount/2
jar_xm_generate_samples_16bit(music->ctxXm, (short *)pcm, samplesCount/2); jar_xm_generate_samples_16bit(music->ctxXm, (short *)pcm, samplesCount/2);
} break; } break;
#endif #endif
#if defined(SUPPORT_FILEFORMAT_MOD) #if defined(SUPPORT_FILEFORMAT_MOD)
case MUSIC_MODULE_MOD: jar_mod_fillbuffer(&music->ctxMod, pcm, samplesCount, 0); break; case MUSIC_MODULE_MOD:
{
// NOTE: 3rd parameter (nbsample) specify the number of stereo 16bits samples you want, so sampleCount/2
jar_mod_fillbuffer(&music->ctxMod, (short *)pcm, samplesCount/2, 0);
} break;
#endif #endif
default: break; default: break;
} }
UpdateAudioStream(music->stream, pcm, samplesCount); UpdateAudioStream(music->stream, pcm, samplesCount);
music->samplesLeft -= samplesCount; if ((music->ctxType == MUSIC_MODULE_XM) || (music->ctxType == MUSIC_MODULE_MOD))
{
music->samplesLeft -= samplesCount/2;
}
else music->samplesLeft -= samplesCount;
if (music->samplesLeft <= 0) if (music->samplesLeft <= 0)
{ {