From 1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Sep 2016 21:07:34 +0200 Subject: audio/out: deprecate "exclusive" sub-options And introduce a global option which does this. Or more precisely, this deprecates the global wasapi and coreaudio options, and adds a new one that merges their functionality. (Due to the way the sub-option deprecation mechanism works, this is simpler.) --- audio/out/ao_wasapi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'audio/out/ao_wasapi.c') diff --git a/audio/out/ao_wasapi.c b/audio/out/ao_wasapi.c index 23a958bb3b..17f3e98653 100644 --- a/audio/out/ao_wasapi.c +++ b/audio/out/ao_wasapi.c @@ -275,6 +275,8 @@ static int init(struct ao *ao) struct wasapi_state *state = ao->priv; state->log = ao->log; + state->opt_exclusive |= ao->init_flags & AO_INIT_EXCLUSIVE; + state->deviceID = wasapi_find_deviceID(ao); if (!state->deviceID) { uninit(ao); @@ -495,7 +497,8 @@ const struct ao_driver audio_out_wasapi = { .hotplug_uninit = hotplug_uninit, .priv_size = sizeof(wasapi_state), .options = (const struct m_option[]) { - OPT_FLAG("exclusive", opt_exclusive, 0), + OPT_FLAG("exclusive", opt_exclusive, 0, + .deprecation_message = "use --audio-exclusive"), OPT_STRING("device", opt_device, 0, DEVICE_OPT_DEPRECATION), {NULL}, }, -- cgit v1.2.3