summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-05-27 18:01:26 +0200
committerwm4 <wm4@nowhere>2015-05-27 18:01:26 +0200
commite8a1d35e9c439ba8a86507e02292cc24fef0174a (patch)
tree76fde40945a2681e55f7405b3849372a91b3df9c /DOCS
parentac6ebbbcbc89ef91fbf4858c86ced53ed471cd14 (diff)
downloadmpv-e8a1d35e9c439ba8a86507e02292cc24fef0174a.tar.bz2
mpv-e8a1d35e9c439ba8a86507e02292cc24fef0174a.tar.xz
options: remove --slave-broken
It has been deprecated for ages.
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/interface-changes.rst1
-rw-r--r--DOCS/man/options.rst22
-rw-r--r--DOCS/mplayer-changes.rst3
3 files changed, 4 insertions, 22 deletions
diff --git a/DOCS/interface-changes.rst b/DOCS/interface-changes.rst
index 998de64e1f..26e9538224 100644
--- a/DOCS/interface-changes.rst
+++ b/DOCS/interface-changes.rst
@@ -20,6 +20,7 @@ Interface changes
::
--- mpv 0.10.0 will be released ---
+ - remove --slave-broken
- add vo opengl custom shader suboptions (source-shader, scale-shader,
pre-shaders, post-shaders)
- completely change how the hwdec properties work:
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index c55f887d1e..f51b471c01 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -348,7 +348,7 @@ Program Behavior
``--idle=<no|yes|once>``
Makes mpv wait idly instead of quitting when there is no file to play.
Mostly useful in slave mode, where mpv can be controlled through input
- commands (see also ``--slave-broken``).
+ commands.
``once`` will only idle at start and let the player close once the
first playlist has finished playing back.
@@ -2250,8 +2250,6 @@ Input
This can also specify a direct file descriptor with ``fd://N`` (UNIX only).
In this case, JSON replies will be written if the FD is writable.
- See also ``--slave-broken``.
-
.. note::
When the given file is a FIFO mpv opens both ends, so you can do several
@@ -3342,21 +3340,3 @@ Miscellaneous
Force the contents of the ``media-title`` property to this value. Useful
for scripts which want to set a title, without overriding the user's
setting in ``--title``.
-
-``--slave-broken``
- Switches on the old slave mode. This is for testing only, and incompatible
- to the removed ``--slave`` switch.
-
- .. attention::
- Changes incompatible to slave mode applications have been made. In
- particular, the status line output was changed, which is used by some
- applications to determine the current playback position. This switch
- has been renamed to prevent these applications from working with this
- version of mpv, because it would lead to buggy and confusing behavior
- only. Moreover, the slave mode protocol is so horribly bad that it
- should not be used for new programs, nor should existing programs
- attempt to adapt to the changed output and use the ``--slave-broken``
- switch. Instead, a new, saner protocol should be developed (and will be,
- if there is enough interest).
-
- This affects most third-party GUI frontends.
diff --git a/DOCS/mplayer-changes.rst b/DOCS/mplayer-changes.rst
index 58b679c9f6..ed916c14d4 100644
--- a/DOCS/mplayer-changes.rst
+++ b/DOCS/mplayer-changes.rst
@@ -397,7 +397,8 @@ Slave mode
Assuming the system supports ``/dev/stdin``.
- (The option was readded in 0.5.1 and sets exactly these options.)
+ (The option was readded in 0.5.1 and sets exactly these options. It was
+ removed in 0.10.x again.)
* A JSON RPC protocol giving access to the client API is also supported. See
`JSON IPC`_ for more information.