summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-11-28 10:12:35 -0800
committerKevin Mitchell <kevmitch@gmail.com>2014-11-28 10:48:36 -0800
commit3b0b89c0affa858d5ed23f7ea618bde9ff2106cf (patch)
treea31f4dba72f13fad1f8f2095d9b42bf6f2764347 /audio
parentd40c0d4f9006b4195a5509ae182e377ae88d16f6 (diff)
downloadmpv-3b0b89c0affa858d5ed23f7ea618bde9ff2106cf.tar.bz2
mpv-3b0b89c0affa858d5ed23f7ea618bde9ff2106cf.tar.xz
ao/wasapi: just return 0 unconditionally from the thread
We weren't actually checking this value anyway. We only really cared about init failure, which was checked another way.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/ao_wasapi.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 30767549fd..666cda557e 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -120,18 +120,14 @@ static DWORD __stdcall ThreadLoop(void *lpParameter)
{
struct ao *ao = lpParameter;
if (!ao || !ao->priv)
- return -1;
+ return 1;
struct wasapi_state *state = (struct wasapi_state *)ao->priv;
- int thread_ret;
CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
state->init_ret = wasapi_thread_init(ao);
SetEvent(state->init_done);
- if (state->init_ret != S_OK) {
- thread_ret = -1;
+ if (state->init_ret != S_OK)
goto exit_label;
- }
-
DWORD waitstatus;
HANDLE playcontrol[] =
@@ -143,7 +139,6 @@ static DWORD __stdcall ThreadLoop(void *lpParameter)
switch (waitstatus) {
case WAIT_OBJECT_0: /*shutdown*/
MP_DBG(ao, "Thread shutdown\n");
- thread_ret = 0;
goto exit_label;
case (WAIT_OBJECT_0 + 1): /* feed */
thread_feed(ao);
@@ -158,7 +153,6 @@ static DWORD __stdcall ThreadLoop(void *lpParameter)
break;
default:
MP_ERR(ao, "Unhandled case in thread loop");
- thread_ret = -1;
goto exit_label;
}
}
@@ -166,8 +160,8 @@ exit_label:
wasapi_thread_uninit(ao);
CoUninitialize();
- MP_DBG(ao, "Thread return %u\n", (unsigned)thread_ret);
- return thread_ret;
+ MP_DBG(ao, "Thread return\n");
+ return 0;
}
static void closehandles(struct ao *ao)