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_coreaudio.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_coreaudio.c')
| -rw-r--r-- | audio/out/ao_coreaudio.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 36be7c5872..e8b0179d20 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -626,14 +626,11 @@ static float get_delay(struct ao *ao) return mp_ring_buffered(p->buffer) / (float)ao->bps; } -static void uninit(struct ao *ao, bool immed) +static void uninit(struct ao *ao) { struct priv *p = ao->priv; OSStatus err = noErr; - if (!immed) - mp_sleep_us(get_delay(ao) * 1000000); - if (!p->is_digital) { AudioOutputUnitStop(p->audio_unit); AudioUnitUninitialize(p->audio_unit); |