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

Music doesn't stop looping fix (#2605)

Browse source 
This PR fixes a bug when music.looping is set to false but the music continues looping.
Also using proper functions to seek to start of an audio file.
Removed old comment.
This commit is contained in:
veins1 2022-08-01 23:07:32 +05:00 • committed by GitHub
parent 2e5fc3d0c2
commit a6b3c8aa1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/raudio.c
View file

@ -1734,14 +1734,13 @@ void UpdateMusicStream(Music music)
AUDIO.System.pcmBufferSize = pcmSize; AUDIO.System.pcmBufferSize = pcmSize;
} }
int framesLeft = music.frameCount - music.stream.buffer->framesProcessed; // Frames left to be processed
int framesToStream = 0; // Total frames to be streamed
// Check both sub-buffers to check if they require refilling // Check both sub-buffers to check if they require refilling
for (int i = 0; i < 2; i++) for (int i = 0; i < 2; i++)
{ {
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
unsigned int framesLeft = music.frameCount - music.stream.buffer->framesProcessed; // Frames left to be processed
unsigned int framesToStream = 0; // Total frames to be streamed
if ((framesLeft >= subBufferSizeInFrames) || music.looping) framesToStream = subBufferSizeInFrames; if ((framesLeft >= subBufferSizeInFrames) || music.looping) framesToStream = subBufferSizeInFrames;
else framesToStream = framesLeft; else framesToStream = framesLeft;
@ -1760,7 +1759,7 @@ void UpdateMusicStream(Music music)
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) break; if (frameCountStillNeeded == 0) break;
else drwav_seek_to_pcm_frame((drwav *)music.ctxData, 0); else drwav_seek_to_first_pcm_frame((drwav *)music.ctxData);
} }
} }
else if (music.stream.sampleSize == 32) else if (music.stream.sampleSize == 32)
@ -1771,7 +1770,7 @@ void UpdateMusicStream(Music music)
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) break; if (frameCountStillNeeded == 0) break;
else drwav_seek_to_pcm_frame((drwav *)music.ctxData, 0); else drwav_seek_to_first_pcm_frame((drwav *)music.ctxData);
} }
} }
} break; } break;
@ -1798,7 +1797,7 @@ void UpdateMusicStream(Music music)
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) break; if (frameCountStillNeeded == 0) break;
else drflac_seek_to_pcm_frame((drflac *)music.ctxData, 0); else drflac__seek_to_first_frame((drflac *)music.ctxData);
} }
} break; } break;
#endif #endif
@ -1811,7 +1810,7 @@ void UpdateMusicStream(Music music)
frameCountRedTotal += frameCountRed; frameCountRedTotal += frameCountRed;
frameCountStillNeeded -= frameCountRed; frameCountStillNeeded -= frameCountRed;
if (frameCountStillNeeded == 0) break; if (frameCountStillNeeded == 0) break;
else drmp3_seek_to_pcm_frame((drmp3 *)music.ctxData, 0); else drmp3_seek_to_start_of_stream((drmp3 *)music.ctxData);
} }
} break; } break;
#endif #endif
@ -1842,6 +1841,8 @@ void UpdateMusicStream(Music music)
UpdateAudioStream(music.stream, AUDIO.System.pcmBuffer, framesToStream); UpdateAudioStream(music.stream, AUDIO.System.pcmBuffer, framesToStream);
music.stream.buffer->framesProcessed = music.stream.buffer->framesProcessed%music.frameCount;
if (framesLeft <= subBufferSizeInFrames) if (framesLeft <= subBufferSizeInFrames)
{ {
// Streaming is ending, we filled latest frames from input // Streaming is ending, we filled latest frames from input
@ -1850,7 +1851,6 @@ void UpdateMusicStream(Music music)
} }
} }
// Reset audio stream for looping
if (streamEnding) if (streamEnding)
{ {
if (!music.looping) StopMusicStream(music); if (!music.looping) StopMusicStream(music);