diff options
| author | wm4 <wm4@nowhere> | 2014-10-19 21:38:43 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-10-19 22:34:37 +0200 |
| commit | cf627fd3de180f0cb0173e016f160de8399cd692 (patch) | |
| tree | aba79cbcedddf551b02ada261dcde3cda964572e /DOCS/man/options.rst | |
| parent | f8f0098560c9b88c927b76c435f47aaf70cfc871 (diff) | |
| download | mpv-cf627fd3de180f0cb0173e016f160de8399cd692.tar.bz2 mpv-cf627fd3de180f0cb0173e016f160de8399cd692.tar.xz | |
ipc: accept both JSON and "old" commands
Minimizes the differences between --input-file and --input-unix-socket.
Diffstat (limited to 'DOCS/man/options.rst')
| -rw-r--r-- | DOCS/man/options.rst | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst index aceca84d65..be00c1844a 100644 --- a/DOCS/man/options.rst +++ b/DOCS/man/options.rst @@ -2162,7 +2162,11 @@ Input like any other binding). See `INPUT.CONF`_. ``--input-file=<filename>`` - Read commands from the given file. Mostly useful with a FIFO. + Read commands from the given file. Mostly useful with a FIFO. Since + mpv 0.7.0 also understands JSON commands (see `JSON IPC`_), but you can't + get replies or events. Use ``--input-unix-socket`` for something + bi-directional. + See also ``--slave-broken``. .. note:: @@ -2182,6 +2186,8 @@ Input ``--input-unix-socket=<filename>`` Enable the IPC support and create the listening socket at the given path. + See `JSON IPC`_ for details. + ``--input-appleremote=<yes|no>`` (OS X only) Enable/disable Apple Remote support. Enabled by default (except for libmpv). |