summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-11-21 19:33:31 +0100
committerwm4 <wm4@nowhere>2016-11-21 19:35:06 +0100
commitde37c5b1cbdc8a8c1fd6a4e3494396fb9608fd8b (patch)
tree4ef6410e0262344150643a13ac8759b6687b97c9 /audio
parentfcba41e2e4752d6391c76ef4e2c9f0c8c5734159 (diff)
downloadmpv-de37c5b1cbdc8a8c1fd6a4e3494396fb9608fd8b.tar.bz2
mpv-de37c5b1cbdc8a8c1fd6a4e3494396fb9608fd8b.tar.xz
audio: fix --audio-stream-silence with ao_wasapi
Seems like wasapi will restart the HDMI stream if resume is called during playback.
Diffstat (limited to 'audio')
-rw-r--r--audio/out/pull.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/audio/out/pull.c b/audio/out/pull.c
index 44f6ab3355..a656de6fdd 100644
--- a/audio/out/pull.c
+++ b/audio/out/pull.c
@@ -101,7 +101,8 @@ static int play(struct ao *ao, void **data, int samples, int flags)
int state = atomic_load(&p->state);
if (!IS_PLAYING(state)) {
set_state(ao, AO_STATE_PLAY);
- ao->driver->resume(ao);
+ if (!ao->stream_silence)
+ ao->driver->resume(ao);
}
return write_samples;
@@ -203,7 +204,8 @@ static void pause(struct ao *ao)
static void resume(struct ao *ao)
{
set_state(ao, AO_STATE_PLAY);
- ao->driver->resume(ao);
+ if (!ao->stream_silence)
+ ao->driver->resume(ao);
}
static bool get_eof(struct ao *ao)