summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-10-19 21:38:43 +0200
committerwm4 <wm4@nowhere>2014-10-19 22:34:37 +0200
commitcf627fd3de180f0cb0173e016f160de8399cd692 (patch)
treeaba79cbcedddf551b02ada261dcde3cda964572e /DOCS/man
parentf8f0098560c9b88c927b76c435f47aaf70cfc871 (diff)
downloadmpv-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')
-rw-r--r--DOCS/man/ipc.rst4
-rw-r--r--DOCS/man/options.rst8
2 files changed, 11 insertions, 1 deletions
diff --git a/DOCS/man/ipc.rst b/DOCS/man/ipc.rst
index 83aa018b03..f0c6004006 100644
--- a/DOCS/man/ipc.rst
+++ b/DOCS/man/ipc.rst
@@ -47,6 +47,10 @@ mpv will also send events to clients with JSON messages of the following form:
where ``event_name`` is the name of the event. Additional event-specific fields
can also be present. See `List of events`_ for a list of all supported events.
+If the first character (after skipping whitespace) is not ``{``, the command
+will be interpreted as non-JSON text command, as they are used in input.conf
+(or ``mpv_command_string()`` in the client API).
+
Commands
--------
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).