i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FileGameSound: fix stuck in pause when ramped

Browse Source 
Change-Id: I346d7b93fa8507451ee46856ad6618acd6e2d609
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3469
Reviewed-by: Jérôme Duval <[email protected]>
This commit is contained in:
Máximo Castañeda
2020-12-08 04:32:56 +00:00
committed by waddlesplash
parent 15de111dcf
commit 8e9d64f0d6
1 changed files with 50 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/game/FileGameSound.cpp
+50 -69
View File
@@ -188,79 +188,60 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount)
char* buffer = (char*)inBuffer; char* buffer = (char*)inBuffer;
size_t out_offset = 0; size_t out_offset = 0;
while (inByteCount > 0 && !fPaused) { while (inByteCount > 0 && (!fPaused || fPausing != NULL)) {
if (!fPaused || fPausing) { if (fPlayPosition == 0 || fPlayPosition >= fBufferSize) {
if (fPlayPosition == 0 || fPlayPosition >= fBufferSize) { if (!Load())
if (!Load()) break;
}
size_t bytes = fBufferSize - fPlayPosition;
if (bytes > inByteCount)
bytes = inByteCount;
if (fPausing != NULL) {
Lock();
bool rampDone = false;
switch(Format().format) {
case gs_audio_format::B_GS_U8:
rampDone = ::FillBuffer<uint8>(fPausing,
(uint8*)&buffer[out_offset],
(uint8*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_S16:
rampDone = ::FillBuffer<int16>(fPausing,
(int16*)&buffer[out_offset],
(int16*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_S32:
rampDone = ::FillBuffer<int32>(fPausing,
(int32*)&buffer[out_offset],
(int32*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_F:
rampDone = ::FillBuffer<float>(fPausing,
(float*)&buffer[out_offset],
(float*)&fBuffer[fPlayPosition], &bytes);
break; break;
} }
if (fPausing) { if (rampDone) {
Lock(); delete fPausing;
fPausing = NULL;
bool rampDone = false;
size_t bytes = fBufferSize - fPlayPosition;
if (bytes > inByteCount) {
bytes = inByteCount;
}
// Fill the requested buffer, stopping if the paused flag is set
switch(Format().format) {
case gs_audio_format::B_GS_U8:
rampDone = ::FillBuffer<uint8>(fPausing,
(uint8*)&buffer[out_offset],
(uint8*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_S16:
rampDone = ::FillBuffer<int16>(fPausing,
(int16*)&buffer[out_offset],
(int16*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_S32:
rampDone = ::FillBuffer<int32>(fPausing,
(int32*)&buffer[out_offset],
(int32*)&fBuffer[fPlayPosition], &bytes);
break;
case gs_audio_format::B_GS_F:
rampDone = ::FillBuffer<float>(fPausing,
(float*)&buffer[out_offset],
(float*)&fBuffer[fPlayPosition], &bytes);
break;
}
inByteCount -= bytes;
out_offset += bytes;
fPlayPosition += bytes;
// We finished ramping
if (rampDone) {
// Need to be able to stop asap when pause flag is flipped.
while (fPlayPosition < fBufferSize && (inByteCount > 0)) {
buffer[out_offset++] = fBuffer[fPlayPosition++];
inByteCount--;
}
delete fPausing;
fPausing = NULL;
}
Unlock();
} else {
// Need to be able to stop asap when the pause flag is flipped.
while (fPlayPosition < fBufferSize && (!fPaused || fPausing)
&& (inByteCount > 0)) {
buffer[out_offset++] = fBuffer[fPlayPosition++];
inByteCount--;
}
} }
}
Unlock();
} else
memcpy(&buffer[out_offset], &fBuffer[fPlayPosition], bytes);
inByteCount -= bytes;
out_offset += bytes;
fPlayPosition += bytes;
} }
// Fill the rest with silence // Fill the rest with silence