mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(WASAPI) Get rid of one unnecessary function

Browse Source
This commit is contained in:
twinaphex 2020-01-04 09:09:04 +01:00
parent 65e8b28d02
commit 688629d108
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
audio/drivers/wasapi.c
View File

@ -737,38 +737,14 @@ static ssize_t wasapi_write_sh_nonblock(wasapi_t *w, const void * data, size_t s
return written; return written;
} }
static ssize_t wasapi_write_ex_nonblock(wasapi_t *w, const void * data, size_t size) static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size, DWORD ms)
{ {
ssize_t written = 0; ssize_t written = 0;
size_t write_avail = fifo_write_avail(w->buffer); size_t write_avail = fifo_write_avail(w->buffer);
if (!write_avail) if (!write_avail)
{ {
if (WaitForSingleObject( if (WaitForSingleObject(w->write_event, ms) != WAIT_OBJECT_0)
w->write_event, 0) != WAIT_OBJECT_0)
return 0;
if (!wasapi_flush_buffer(w, w->engine_buffer_size))
return -1;
write_avail = w->engine_buffer_size;
}
written = size < write_avail ? size : write_avail;
fifo_write(w->buffer, data, written);
return written;
}
static ssize_t wasapi_write_ex(wasapi_t *w, const void * data, size_t size)
{
ssize_t written = 0;
size_t write_avail = fifo_write_avail(w->buffer);
if (!write_avail)
{
if (WaitForSingleObject(
w->write_event, INFINITE) != WAIT_OBJECT_0)
return -1; return -1;
if (!wasapi_flush_buffer(w, w->engine_buffer_size)) if (!wasapi_flush_buffer(w, w->engine_buffer_size))
@ -791,7 +767,7 @@ static ssize_t wasapi_write(void *wh, const void *data, size_t size)
if (w->nonblock) if (w->nonblock)
{ {
if (w->exclusive) if (w->exclusive)
return wasapi_write_ex_nonblock(w, data, size); return wasapi_write_ex(w, data, size, 0);
return wasapi_write_sh_nonblock(w, data, size); return wasapi_write_sh_nonblock(w, data, size);
} }
@ -800,7 +776,7 @@ static ssize_t wasapi_write(void *wh, const void *data, size_t size)
ssize_t ir; ssize_t ir;
for (ir = -1; written < size; written += ir) for (ir = -1; written < size; written += ir)
{ {
ir = wasapi_write_ex(w, (char*)data + written, size - written); ir = wasapi_write_ex(w, (char*)data + written, size - written, INFINITE);
if (ir == -1) if (ir == -1)
return -1; return -1;
} }