diff options
| author | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-02 00:30:43 -0700 |
|---|---|---|
| committer | Kevin Mitchell <kevmitch@gmail.com> | 2015-04-03 15:39:51 -0700 |
| commit | 07671ac57b41710201e9a0f22b8a8d0febad1c37 (patch) | |
| tree | ac52288fcbd3622519abbf2e1bb1bf118a350b82 /audio/out/ao_wasapi.c | |
| parent | 8fbc64f74e85d3f6bb36697ac66c96e4f7c9caf2 (diff) | |
| download | mpv-07671ac57b41710201e9a0f22b8a8d0febad1c37.tar.bz2 mpv-07671ac57b41710201e9a0f22b8a8d0febad1c37.tar.xz | |
ao_wasapi: passthrough rework
* unify passthrough and pcm exclusive mode format setting/testing
* set passthrough format parameters correctly
* support all of mpv's existing passthrough formats
* automatically test passthrough with exclusive mode and enable
exclusive if it succeeds, even if it was not explictly requested.
this obviates the need for --ao=wasapi,wasapi=exclusive
* if passthrough fails (such as the device doesn't support the
format), fallback to either exclusive pcm or shared mode depending
on what the user specified. Right now this isn't very useful as
it still fails due to the decoder path remainin stuck on spdif.
fixes #1742
Diffstat (limited to 'audio/out/ao_wasapi.c')
| -rw-r--r-- | audio/out/ao_wasapi.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index a08364ad29..205a25d03e 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -243,12 +243,6 @@ static int init(struct ao *ao) if(!wasapi_fill_VistaBlob(state)) MP_WARN(ao, "Error loading thread priority functions\n"); - if (state->opt_exclusive) { - state->share_mode = AUDCLNT_SHAREMODE_EXCLUSIVE; - } else { - state->share_mode = AUDCLNT_SHAREMODE_SHARED; - } - state->init_done = CreateEventW(NULL, FALSE, FALSE, NULL); state->hUninit = CreateEventW(NULL, FALSE, FALSE, NULL); state->hFeed = CreateEventW(NULL, FALSE, FALSE, NULL); /* for wasapi event mode */ |