|
|
@ -1518,16 +1518,14 @@ Music LoadMusicStreamFromMemory(const char *fileType, const unsigned char *data, |
|
|
|
jar_xm_set_max_loop_count(ctxXm, 0); // Set infinite number of loops |
|
|
|
|
|
|
|
unsigned int bits = 32; |
|
|
|
if (AUDIO_DEVICE_FORMAT == ma_format_s16) |
|
|
|
bits = 16; |
|
|
|
else if (AUDIO_DEVICE_FORMAT == ma_format_u8) |
|
|
|
bits = 8; |
|
|
|
if (AUDIO_DEVICE_FORMAT == ma_format_s16) bits = 16; |
|
|
|
else if (AUDIO_DEVICE_FORMAT == ma_format_u8) bits = 8; |
|
|
|
|
|
|
|
// NOTE: Only stereo is supported for XM |
|
|
|
music.stream = LoadAudioStream(AUDIO.System.device.sampleRate, bits, 2); |
|
|
|
music.frameCount = (unsigned int)jar_xm_get_remaining_samples(ctxXm); // NOTE: Always 2 channels (stereo) |
|
|
|
music.looping = true; // Looping enabled by default |
|
|
|
jar_xm_reset(ctxXm); // make sure we start at the beginning of the song |
|
|
|
jar_xm_reset(ctxXm); // make sure we start at the beginning of the song |
|
|
|
|
|
|
|
music.ctxData = ctxXm; |
|
|
|
musicLoaded = true; |
|
|
@ -1548,7 +1546,7 @@ Music LoadMusicStreamFromMemory(const char *fileType, const unsigned char *data, |
|
|
|
for (int i = 0; i < it; i++) newData[i] = data[i]; |
|
|
|
|
|
|
|
// Memory loaded version for jar_mod_load_file() |
|
|
|
if (dataSize && dataSize < 32*1024*1024) |
|
|
|
if (dataSize && p">(dataSize < 32*1024*1024)) |
|
|
|
{ |
|
|
|
ctxMod->modfilesize = dataSize; |
|
|
|
ctxMod->modfile = newData; |
|
|
|