diff options
| author | wm4 <wm4@nowhere> | 2016-11-25 21:00:39 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-11-25 21:17:25 +0100 |
| commit | 1a2319f3e4cc42c680e2fd3ba30022c7a9adf3fe (patch) | |
| tree | 37261ccac2acc614777ba4c790cfed78b96fb58f /audio/out/ao_wasapi_utils.c | |
| parent | 98a257b3a871587a97f51ef1b09800959a94ed1e (diff) | |
| download | mpv-1a2319f3e4cc42c680e2fd3ba30022c7a9adf3fe.tar.bz2 mpv-1a2319f3e4cc42c680e2fd3ba30022c7a9adf3fe.tar.xz | |
options: remove deprecated sub-option handling for --vo and --ao
Long planned. Leads to some sanity.
There still are some rather gross things. Especially g_groups is ugly,
and a hack that can hopefully be removed. (There is a plan for it, but
whether it's implemented depends on how much energy is left.)
Diffstat (limited to 'audio/out/ao_wasapi_utils.c')
| -rw-r--r-- | audio/out/ao_wasapi_utils.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/audio/out/ao_wasapi_utils.c b/audio/out/ao_wasapi_utils.c index 320bb6767b..8b12ef4d5c 100644 --- a/audio/out/ao_wasapi_utils.c +++ b/audio/out/ao_wasapi_utils.c @@ -858,10 +858,7 @@ static LPWSTR select_device(struct mp_log *l, struct device_desc *d) bstr wasapi_get_specified_device_string(struct ao *ao) { struct wasapi_state *state = ao->priv; - bstr device = bstr_strip(bstr0(state->opt_device)); - if (!device.len) - device = bstr_strip(bstr0(ao->device)); - return device; + return bstr_strip(bstr0(ao->device)); } LPWSTR wasapi_find_deviceID(struct ao *ao) |