summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Mitchell <kevmitch@gmail.com>2014-11-12 00:40:30 -0800
committerKevin Mitchell <kevmitch@gmail.com>2014-11-17 03:37:07 -0800
commit6eb5c6d186c6cd6bd945e408bfc9292e8d17d1da (patch)
treef5f2d21fc30b751d255cc17e7bb7a0c54d0a3811
parent227f0e3f392d61018886f4af98bcf7f6692af13a (diff)
downloadmpv-6eb5c6d186c6cd6bd945e408bfc9292e8d17d1da.tar.bz2
mpv-6eb5c6d186c6cd6bd945e408bfc9292e8d17d1da.tar.xz
ao/wasapi: reenable the reset function
the race condition that necessitated disabling this was fixed in e4403523131a69a92a8418bb3714090a408680c7
-rw-r--r--audio/out/ao_wasapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c
index 66de466bbc..c9a079ffc9 100644
--- a/audio/out/ao_wasapi.c
+++ b/audio/out/ao_wasapi.c
@@ -342,7 +342,7 @@ const struct ao_driver audio_out_wasapi = {
.init = init,
.uninit = uninit,
.control = control,
- //.reset = audio_reset, <- doesn't wait for audio callback to return
+ .reset = audio_reset,
.resume = audio_resume,
.list_devs = list_devs,
.priv_size = sizeof(wasapi_state),