mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

More extensive error checking in dsound.

Browse Source
This commit is contained in:
Themaister 2011-08-05 13:35:02 +02:00
parent 079a0100c0
commit b337856f80
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
audio/dsound.c
View File

@ -52,27 +52,52 @@ static inline void get_positions(dsound_t *ds, DWORD *read_ptr, DWORD *write_ptr
}
#define CHUNK_SIZE 256
#define BUFFER_ERROR ((void*)-1)
static inline void* grab_chunk(dsound_t *ds, DWORD write_ptr)
{
void *chunk;
DWORD bytes;
void *chunk = NULL;
DWORD bytes = 0;
HRESULT res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE, &chunk, &bytes, NULL, NULL, 0);
if (res == DSERR_BUFFERLOST)
{
res = IDirectSoundBuffer_Restore(ds->dsb);
if (res != DS_OK)
return NULL;
return BUFFER_ERROR;
res = IDirectSoundBuffer_Lock(ds->dsb, write_ptr, CHUNK_SIZE, &chunk, &bytes, NULL, NULL, 0);
if (res != DS_OK)
return NULL;
}
const char *err;
switch (res)
{
case DSERR_BUFFERLOST:
err = "DSERR_BUFFERLOST";
break;
case DSERR_INVALIDCALL:
err = "DSERR_INVALIDCALL";
break;
case DSERR_INVALIDPARAM:
err = "DSERR_INVALIDPARAM";
break;
case DSERR_PRIOLEVELNEEDED:
err = "DSERR_PRIOLEVELNEEDED";
break;
default:
err = NULL;
}
if (err)
SSNES_ERR("[DirectSound Error]: %s\n", err);
if (bytes != CHUNK_SIZE)
{
SSNES_ERR("[DirectSound]: Could not lock as much data as requested, this should not happen!\n");
IDirectSoundBuffer_Unlock(ds->dsb, chunk, bytes, NULL, 0);
if (chunk)
IDirectSoundBuffer_Unlock(ds->dsb, chunk, bytes, NULL, 0);
return NULL;
}
@ -115,12 +140,17 @@ static DWORD CALLBACK dsound_thread(PVOID data)
else if (fifo_avail < CHUNK_SIZE) // Got space to write, but nothing in FIFO (underrun), fill block with silence.
{
void *chunk;
if (!(chunk = grab_chunk(ds, write_ptr)))
if ((chunk = grab_chunk(ds, write_ptr)) == BUFFER_ERROR)
{
ds->thread_alive = false;
SetEvent(ds->event);
break;
}
else if (chunk == NULL)
{
Sleep(1);
continue;
}
memset(chunk, 0, CHUNK_SIZE);
release_chunk(ds, chunk);
@ -129,12 +159,17 @@ static DWORD CALLBACK dsound_thread(PVOID data)
else // All is good. Pull from it and notify FIFO :D
{
void *chunk;
if (!(chunk = grab_chunk(ds, write_ptr)))
if ((chunk = grab_chunk(ds, write_ptr)) == BUFFER_ERROR)
{
ds->thread_alive = false;
SetEvent(ds->event);
break;
}
else if (chunk == NULL)
{
Sleep(1);
continue;
}
EnterCriticalSection(&ds->crit);
fifo_read(ds->buffer, chunk, CHUNK_SIZE);
@ -324,10 +359,11 @@ static ssize_t dsound_write(void *data, const void *buf_, size_t size)
avail = size;
fifo_write(ds->buffer, buf, avail);
LeaveCriticalSection(&ds->crit);
buf += avail;
size -= avail;
written += avail;
LeaveCriticalSection(&ds->crit);
if (ds->nonblock || !ds->thread_alive)
break;