From 822e040ddb50dd9a1bd888465552e131a9a830ce Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 16 Mar 2014 09:51:46 +0100 Subject: ao_dsound: remove duplicated code --- audio/out/ao_dsound.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'audio/out') diff --git a/audio/out/ao_dsound.c b/audio/out/ao_dsound.c index aba4d882dc..da0c14cdc2 100644 --- a/audio/out/ao_dsound.c +++ b/audio/out/ao_dsound.c @@ -300,23 +300,12 @@ static int write_buffer(struct ao *ao, unsigned char *data, int len) if (SUCCEEDED(res)) { - if (!AF_FORMAT_IS_AC3(ao->format)) { - memcpy(lpvPtr1, data, dwBytes1); - if (lpvPtr2 != NULL) - memcpy(lpvPtr2, (char *)data + dwBytes1, dwBytes2); - - p->write_offset += dwBytes1 + dwBytes2; - if (p->write_offset >= p->buffer_size) - p->write_offset = dwBytes2; - } else { - // Write to pointers without reordering. - memcpy(lpvPtr1, data, dwBytes1); - if (NULL != lpvPtr2) - memcpy(lpvPtr2, data + dwBytes1, dwBytes2); - p->write_offset += dwBytes1 + dwBytes2; - if (p->write_offset >= p->buffer_size) - p->write_offset = dwBytes2; - } + memcpy(lpvPtr1, data, dwBytes1); + if (NULL != lpvPtr2) + memcpy(lpvPtr2, data + dwBytes1, dwBytes2); + p->write_offset += dwBytes1 + dwBytes2; + if (p->write_offset >= p->buffer_size) + p->write_offset = dwBytes2; // Release the data back to DirectSound. res = IDirectSoundBuffer_Unlock(p->hdsbuf, lpvPtr1, dwBytes1, lpvPtr2, -- cgit v1.2.3