gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

directsound: Cleaned up WaitDevice.

Browse Source 
This should retry until GetCurrentPosition succeeds. Otherwise, we would be
going on to the next iteration too soon.

Also generally streamlined the code while I was in here.
This commit is contained in:
Ryan C. Gordon
2023-10-03 09:54:30 -04:00
parent 6c33a05bdb
commit a0820ed833
1 changed files with 16 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/audio/directsound/SDL_directsound.c
View File

@@ -227,61 +227,35 @@ static void DSOUND_DetectDevices(SDL_AudioDevice **default_output, SDL_AudioDevi
static void DSOUND_WaitDevice(SDL_AudioDevice *device) static void DSOUND_WaitDevice(SDL_AudioDevice *device)
{ {
DWORD status = 0;
DWORD cursor = 0;
DWORD junk = 0;
HRESULT result = DS_OK;
/* Semi-busy wait, since we have no way of getting play notification /* Semi-busy wait, since we have no way of getting play notification
on a primary mixing buffer located in hardware (DirectX 5.0) on a primary mixing buffer located in hardware (DirectX 5.0)
*/ */
result = IDirectSoundBuffer_GetCurrentPosition(device->hidden->mixbuf, while (!SDL_AtomicGet(&device->shutdown)) {
&junk, &cursor); DWORD status = 0;
if (result != DS_OK) { DWORD cursor = 0;
if (result == DSERR_BUFFERLOST) { DWORD junk = 0;
IDirectSoundBuffer_Restore(device->hidden->mixbuf); HRESULT result = DS_OK;
}
#ifdef DEBUG_SOUND
SetDSerror("DirectSound GetCurrentPosition", result);
#endif
return;
}
while ((cursor / device->buffer_size) == device->hidden->lastchunk) {
if (SDL_AtomicGet(&device->shutdown)) {
return;
}
SDL_Delay(1);
// Try to restore a lost sound buffer // Try to restore a lost sound buffer
IDirectSoundBuffer_GetStatus(device->hidden->mixbuf, &status); IDirectSoundBuffer_GetStatus(device->hidden->mixbuf, &status);
if (status & DSBSTATUS_BUFFERLOST) { if (status & DSBSTATUS_BUFFERLOST) {
IDirectSoundBuffer_Restore(device->hidden->mixbuf); IDirectSoundBuffer_Restore(device->hidden->mixbuf);
IDirectSoundBuffer_GetStatus(device->hidden->mixbuf, &status); } else if (!(status & DSBSTATUS_PLAYING)) {
if (status & DSBSTATUS_BUFFERLOST) { result = IDirectSoundBuffer_Play(device->hidden->mixbuf, 0, 0, DSBPLAY_LOOPING);
break; } else {
// Find out where we are playing
result = IDirectSoundBuffer_GetCurrentPosition(device->hidden->mixbuf, &junk, &cursor);
if ((result == DS_OK) && ((cursor / device->buffer_size) != device->hidden->lastchunk)) {
break; // ready for next chunk!
} }
} }
if (!(status & DSBSTATUS_PLAYING)) {
result = IDirectSoundBuffer_Play(device->hidden->mixbuf, 0, 0, if ((result != DS_OK) && (result != DSERR_BUFFERLOST)) {
DSBPLAY_LOOPING); SDL_AudioDeviceDisconnected(device);
if (result == DS_OK) {
continue;
}
#ifdef DEBUG_SOUND
SetDSerror("DirectSound Play", result);
#endif
return; return;
} }
// Find out where we are playing SDL_Delay(1); // not ready yet; sleep a bit.
result = IDirectSoundBuffer_GetCurrentPosition(device->hidden->mixbuf,
&junk, &cursor);
if (result != DS_OK) {
SetDSerror("DirectSound GetCurrentPosition", result);
return;
}
} }
} }