summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-05 21:07:34 +0200
committerwm4 <wm4@nowhere>2016-09-05 21:26:39 +0200
commit1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d (patch)
treec463f43610d73a127e2f62a6a39a669c38c36fd9 /DOCS
parent13786dc643fe250a9560792ef342751585ea15e9 (diff)
downloadmpv-1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d.tar.bz2
mpv-1d9032f011a57a31f6a8ccc40a0aba08a8e74e0d.tar.xz
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.)
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/interface-changes.rst2
-rw-r--r--DOCS/man/ao.rst3
-rw-r--r--DOCS/man/options.rst9
3 files changed, 14 insertions, 0 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 3b2ff485ad..f6bffe537d 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -25,6 +25,8 @@ Interface changes
"--vo=opengl:scale=nearest" turns into "--scale=nearest". In some cases,
the global option is prefixed.
- deprecate the device/sink options on all AOs. Use --audio-device instead.
+ - deprecate "--ao=wasapi:exclusive" and "--ao=coreaudio:exclusive",
+ use --audio-exclusive instead.
- subtle changes in how "--no-..." options are treated mean that they are
not accessible under "options/..." anymore (instead, these are resolved
at parsing time). This does not affect options which start with "--no-",
diff --git a/DOCS/man/ao.rst b/DOCS/man/ao.rst
index e82c541024..979da9ee0e 100644
--- a/DOCS/man/ao.rst
+++ b/DOCS/man/ao.rst
@@ -107,10 +107,12 @@ Available audio output drivers are:
utility. Note that this does not affect the selected speaker setup.
``--coreaudio-exclusive``
+ Deprecated, use ``--audio-exclusive``.
Use exclusive mode access. This merely redirects to
``coreaudio_exclusive``, but should be preferred over using that AO
directly.
+
``coreaudio_exclusive`` (Mac OS X only)
Native Mac OS X audio output driver using direct device access and
exclusive mode (bypasses the sound server).
@@ -263,6 +265,7 @@ Available audio output drivers are:
The following global options are supported by this audio output:
``--ao-wasapi-exclusive``
+ Deprecated, use ``--audio-exclusive``.
Requests exclusive, direct hardware access. By definition prevents
sound playback of any other program until mpv exits.
``--ao-wasapi-device=<id>``
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 5d361d10b3..062dc307c0 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -1008,6 +1008,15 @@ Audio
manually. For example ``name/foobar`` forces the AO ``name`` to use the
device ``foobar``.
+``--audio-exclusive=<yes|no>``
+ Enable exclusive output mode. In this mode, the system is usually locked
+ out, and only mpv will be able to output audio.
+
+ This only works for some audio outputs, such as ``wasapi`` and
+ ``coreaudio``. Other audio outputs silently ignore this options. They either
+ have no concept of exclusive mode, or the mpv side of the implementation is
+ missing.
+
``--audio-fallback-to-null=<yes|no>``
If no audio device can be opened, behave as if ``--ao=null`` was given. This
is useful in combination with ``--audio-device``: instead of causing an