diff options
author | wm4 <wm4@nowhere> | 2014-03-09 00:49:39 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-03-09 01:27:41 +0100 |
commit | e16c91d07ab2acfb83fdeaa6dcfcd25c97666504 (patch) | |
tree | 5e5e33af457c4d573a32e15aec95205f4987f9bb /audio/out/ao_wasapi.c | |
parent | 2f03dc259960c9cb282e8f371d9f68266afea49c (diff) | |
download | mpv-e16c91d07ab2acfb83fdeaa6dcfcd25c97666504.tar.bz2 mpv-e16c91d07ab2acfb83fdeaa6dcfcd25c97666504.tar.xz |
audio/out: make draining a separate operation
Until now, this was always conflated with uninit. This was ugly, and
also many AOs emulated this manually (or just ignored it). Make draining
an explicit operation, so AOs which support it can provide it, and for
all others generic code will emulate it.
For ao_wasapi, we keep it simple and basically disable the internal
draining implementation (maybe it should be restored later).
Tested on Linux only.
Diffstat (limited to 'audio/out/ao_wasapi.c')
-rw-r--r-- | audio/out/ao_wasapi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index bb00849adb..a3da9fe388 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -1218,11 +1218,11 @@ static int setup_buffers(struct wasapi_state *state) return !state->ringbuff; } -static void uninit(struct ao *ao, bool block) +static void uninit(struct ao *ao) { MP_VERBOSE(ao, "uninit!\n"); struct wasapi_state *state = (struct wasapi_state *)ao->priv; - state->immed = !block; + state->immed = 1; SetEvent(state->hUninit); /* wait up to 10 seconds */ if (WaitForSingleObject(state->threadLoop, 10000) == WAIT_TIMEOUT) |