From 69283bc0f8905e7748343f2c5389791f858a5f4c Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 5 Sep 2016 21:07:03 +0200 Subject: options: deprecate suboptions for the remaining AO/VOs --- audio/out/ao_coreaudio.c | 1 + 1 file changed, 1 insertion(+) (limited to 'audio/out/ao_coreaudio.c') diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index fbbacde714..1300489084 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -430,4 +430,5 @@ const struct ao_driver audio_out_coreaudio = { OPT_FLAG("exclusive", exclusive, 0), {0} }, + .legacy_prefix = "coreaudio", }; -- cgit v1.2.3 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_coreaudio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'audio/out/ao_coreaudio.c') diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index 1300489084..3a7aa2eac1 100644 --- a/audio/out/ao_coreaudio.c +++ b/audio/out/ao_coreaudio.c @@ -143,6 +143,8 @@ static int init(struct ao *ao) { struct priv *p = ao->priv; + p->exclusive |= ao->init_flags & AO_INIT_EXCLUSIVE; + if (!af_fmt_is_pcm(ao->format) || p->exclusive) { MP_VERBOSE(ao, "redirecting to coreaudio_exclusive\n"); ao->redirect = "coreaudio_exclusive"; @@ -427,7 +429,8 @@ const struct ao_driver audio_out_coreaudio = { .priv_size = sizeof(struct priv), .options = (const struct m_option[]){ OPT_FLAG("change-physical-format", change_physical_format, 0), - OPT_FLAG("exclusive", exclusive, 0), + OPT_FLAG("exclusive", exclusive, 0, + .deprecation_message = "use --audio-exclusive"), {0} }, .legacy_prefix = "coreaudio", -- cgit v1.2.3