MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow raylib formatting

Browse Source
This commit is contained in:
veins1 2022-07-18 18:03:52 +05:00 committed by GitHub
parent b1d38c7879
commit 8830fa560d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/raudio.c
View File

@ -1725,7 +1725,7 @@ void UpdateMusicStream(Music music)
unsigned int subBufferSizeInFrames = music.stream.buffer->sizeInFrames/2; unsigned int subBufferSizeInFrames = music.stream.buffer->sizeInFrames/2;
// On first call of this function we lazily pre-allocated a temp buffer to read audio files/memory data in // On first call of this function we lazily pre-allocated a temp buffer to read audio files/memory data in
int frameSize = music.stream.channels * music.stream.sampleSize / 8; int frameSize = music.stream.channels*music.stream.sampleSize/8;
unsigned int pcmSize = subBufferSizeInFrames*frameSize; unsigned int pcmSize = subBufferSizeInFrames*frameSize;
if (AUDIO.System.pcmBufferSize < pcmSize) if (AUDIO.System.pcmBufferSize < pcmSize)
{ {
@ -1742,16 +1742,8 @@ void UpdateMusicStream(Music music)
{ {
if ((music.stream.buffer != NULL) && !music.stream.buffer->isSubBufferProcessed[i]) continue; // No refilling required, move to next sub-buffer if ((music.stream.buffer != NULL) && !music.stream.buffer->isSubBufferProcessed[i]) continue; // No refilling required, move to next sub-buffer
if (music.looping) { if ((framesLeft >= subBufferSizeInFrames) || music.looping) framesToStream = subBufferSizeInFrames;
framesToStream = subBufferSizeInFrames; else framesToStream = framesLeft;
}
else {
if (framesLeft >= subBufferSizeInFrames) framesToStream = subBufferSizeInFrames;
else
{
framesToStream = framesLeft;
}
}
int frameCountStillNeeded = framesToStream; int frameCountStillNeeded = framesToStream;
int frameCountRedTotal = 0; int frameCountRedTotal = 0;
@ -1760,30 +1752,26 @@ void UpdateMusicStream(Music music)
#if defined(SUPPORT_FILEFORMAT_WAV) #if defined(SUPPORT_FILEFORMAT_WAV)
case MUSIC_AUDIO_WAV: case MUSIC_AUDIO_WAV:
{ {
if (music.stream.sampleSize == 16) { if (music.stream.sampleSize == 16)
while (true) { {
int frameCountRed = drwav_read_pcm_frames_s16((drwav*)music.ctxData, frameCountStillNeeded, (short*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize)); while (true)
{
int frameCountRed = drwav_read_pcm_frames_s16((drwav *)music.ctxData, frameCountStillNeeded, (short *)(AUDIO.System.pcmBuffer + frameCountRedTotal*frameSize));
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) { if (frameCountStillNeeded == 0) break;
break; else drwav_seek_to_pcm_frame((drwav *)music.ctxData, 0);
}
else {
drwav_seek_to_pcm_frame((drwav*)music.ctxData, 0);
}
} }
} }
else if (music.stream.sampleSize == 32) { else if (music.stream.sampleSize == 32)
while (true) { {
int frameCountRed = drwav_read_pcm_frames_f32((drwav*)music.ctxData, frameCountStillNeeded, (float*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize)); while (true)
{
int frameCountRed = drwav_read_pcm_frames_f32((drwav *)music.ctxData, frameCountStillNeeded, (float *)(AUDIO.System.pcmBuffer + frameCountRedTotal*frameSize));
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) { if (frameCountStillNeeded == 0) break;
break; else drwav_seek_to_pcm_frame((drwav *)music.ctxData, 0);
}
else {
drwav_seek_to_pcm_frame((drwav*)music.ctxData, 0);
}
} }
} }
} break; } break;
@ -1791,48 +1779,39 @@ void UpdateMusicStream(Music music)
#if defined(SUPPORT_FILEFORMAT_OGG) #if defined(SUPPORT_FILEFORMAT_OGG)
case MUSIC_AUDIO_OGG: case MUSIC_AUDIO_OGG:
{ {
while (true) { while (true)
int frameCountRed = stb_vorbis_get_samples_short_interleaved((stb_vorbis*)music.ctxData, music.stream.channels, (short*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize), frameCountStillNeeded * music.stream.channels); {
int frameCountRed = stb_vorbis_get_samples_short_interleaved((stb_vorbis *)music.ctxData, music.stream.channels, (short *)(AUDIO.System.pcmBuffer + frameCountRedTotal*frameSize), frameCountStillNeeded*music.stream.channels);
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) { if (frameCountStillNeeded == 0) break;
break; else stb_vorbis_seek_start((stb_vorbis *)music.ctxData);
}
else {
stb_vorbis_seek_start((stb_vorbis*)music.ctxData);
}
} }
} break; } break;
#endif #endif
#if defined(SUPPORT_FILEFORMAT_FLAC) #if defined(SUPPORT_FILEFORMAT_FLAC)
case MUSIC_AUDIO_FLAC: case MUSIC_AUDIO_FLAC:
{ {
while (true) { while (true)
int frameCountRed = drflac_read_pcm_frames_s16((drflac*)music.ctxData, frameCountStillNeeded, (short*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize)); {
int frameCountRed = drflac_read_pcm_frames_s16((drflac *)music.ctxData, frameCountStillNeeded, (short *)(AUDIO.System.pcmBuffer + frameCountRedTotal*frameSize));
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) { if (frameCountStillNeeded == 0) break;
break; else drflac_seek_to_pcm_frame((drflac *)music.ctxData, 0);
}
else {
drflac_seek_to_pcm_frame((drflac*)music.ctxData, 0);
}
} }
} break; } break;
#endif #endif
#if defined(SUPPORT_FILEFORMAT_MP3) #if defined(SUPPORT_FILEFORMAT_MP3)
case MUSIC_AUDIO_MP3: case MUSIC_AUDIO_MP3:
{ {
while (true) { while (true)
int frameCountRed = drmp3_read_pcm_frames_f32((drmp3*)music.ctxData, frameCountStillNeeded, (float*)(AUDIO.System.pcmBuffer + frameCountRedTotal * frameSize)); {
int frameCountRed = drmp3_read_pcm_frames_f32((drmp3 *)music.ctxData, frameCountStillNeeded, (float *)(AUDIO.System.pcmBuffer + frameCountRedTotal*frameSize));
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) { if (frameCountStillNeeded == 0) break;
break; else drmp3_seek_to_pcm_frame((drmp3 *)music.ctxData, 0);
}
else {
drmp3_seek_to_pcm_frame((drmp3*)music.ctxData, 0);
}
} }
} break; } break;
#endif #endif
@ -1874,10 +1853,7 @@ void UpdateMusicStream(Music music)
// Reset audio stream for looping // Reset audio stream for looping
if (streamEnding) if (streamEnding)
{ {
if (!music.looping) if (!music.looping) StopMusicStream(music);
{
StopMusicStream(music);
}
} }
else else
{ {