From 0e7cf9518ae00e47f95762ead0c173fd6ac5f71d Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 15 Aug 2012 22:21:17 +0200 Subject: core: intentionally cripple slave mode Rename -slave to -slave-broken to prevent slave mode applications from working. Do this to prevent horrible user experiences, in case someone should attempt to try this version of mplayer with smplayer and others. This also makes it clear that we don't intend to keep slave mode compatibility, because the slave mode protocol is horrible and bad. See the changes in options.rst for further reasons and comments. --- DOCS/man/en/options.rst | 25 +++++++++++++++---------- cfg-mplayer.h | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 4810ee9ea5..a842187137 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1743,16 +1743,21 @@ - ``mplayer --slang=jpn example.mkv`` plays a Matroska file with Japanese subtitles. ---slave - Switches on slave mode, in which MPlayer works as a backend for other - programs. Instead of intercepting keyboard events, MPlayer will read - commands separated by a newline (\n) from stdin. See also ``--input``, - suboption ``file``. - - *NOTE*: See ``DOCS/tech/slave.txt`` for a description of slave commands. - Also, this is not intended to disable other inputs, e.g. via the video - window. If you want to do that, use something like - ``--input=nodefault-bindings:conf=/dev/null``. +--slave-broken + Switches on the old slave mode. This is for testing only, and incompatible + to the removed --slave switch. + + *NOTE*: 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 mplayer, 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, if there is enough interest). + + This affects smplayer, smplayer2, mplayosx, and others. --slices, --no-slices Drawing video by 16-pixel height slices/bands, instead draws the diff --git a/cfg-mplayer.h b/cfg-mplayer.h index c250d94874..83fe9e3589 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -783,7 +783,7 @@ const m_option_t mplayer_opts[]={ OPT_STRING("term-osd-esc", term_osd_esc, 0, OPTDEF_STR("\x1b[A\r\x1b[K")), OPT_STRING("playing-msg", playing_msg, 0), - {"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL}, + {"slave-broken", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL}, OPT_MAKE_FLAGS("idle", player_idle_mode, CONF_GLOBAL), OPT_INTRANGE("key-fifo-size", input.key_fifo_size, CONF_GLOBAL, 2, 65000), OPT_MAKE_FLAGS("consolecontrols", consolecontrols, CONF_GLOBAL), -- cgit v1.2.3