diff options
| author | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
|---|---|---|
| committer | Martin Herkt <lachs0r@srsfckn.biz> | 2016-10-19 19:09:00 +0200 |
| commit | 5d74fa7dc0fa1617d1d11b69769423b1387ec785 (patch) | |
| tree | 882752015b3500c91b8ab3a4d669696f23feb817 /audio/out/ao_coreaudio.c | |
| parent | c226bc7616ab2ae9de6172660e9cf727f07dc374 (diff) | |
| parent | a2fa0d0b68ce200598122145254f56ae1adff91e (diff) | |
| download | mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.bz2 mpv-5d74fa7dc0fa1617d1d11b69769423b1387ec785.tar.xz | |
Merge branch 'master' into release/current
Diffstat (limited to 'audio/out/ao_coreaudio.c')
| -rw-r--r-- | audio/out/ao_coreaudio.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/audio/out/ao_coreaudio.c b/audio/out/ao_coreaudio.c index fbbacde714..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,9 @@ 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", }; |