summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-05-31 14:43:13 +0200
committerwm4 <wm4@nowhere>2020-05-31 14:43:13 +0200
commitd448dd5bf26408ccced1bd6df8f9eaf62a370c8e (patch)
tree296187fc87fc547b2783a0f180645c1113f78cd1
parent102a083171478c69a8d2dd7de7c40d7687a9e809 (diff)
downloadmpv-d448dd5bf26408ccced1bd6df8f9eaf62a370c8e.tar.bz2
mpv-d448dd5bf26408ccced1bd6df8f9eaf62a370c8e.tar.xz
audio: fix unpausing with some AOs
wasapi/coreaudio/sdl were affected, alsa/pusle were not. The confusion here was that resume() has different meaning with pull and push AOs. Fixes: #7772
-rw-r--r--audio/out/buffer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/out/buffer.c b/audio/out/buffer.c
index 720cfaa58e..d1563452d1 100644
--- a/audio/out/buffer.c
+++ b/audio/out/buffer.c
@@ -366,7 +366,7 @@ void ao_resume(struct ao *ao)
pthread_mutex_lock(&p->lock);
if (p->playing && p->paused) {
- if (p->streaming && ao->driver->resume)
+ if (ao->driver->resume && (!p->streaming || ao->driver->play))
ao->driver->resume(ao);
p->paused = false;
p->expected_end_time = 0;