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_jack.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_jack.c')
-rw-r--r-- | audio/out/ao_jack.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/out/ao_jack.c b/audio/out/ao_jack.c index b3cd3fd6ef..6e9b652f2d 100644 --- a/audio/out/ao_jack.c +++ b/audio/out/ao_jack.c @@ -207,13 +207,10 @@ err_chmap: } // close audio device -static void uninit(struct ao *ao, bool immed) +static void uninit(struct ao *ao) { struct priv *p = ao->priv; - if (!immed) - ao_wait_drain(ao); - jack_client_close(p->client); } |