diff options
| author | James Ross-Gowan <rossymiles@gmail.com> | 2016-03-18 18:46:13 +1100 |
|---|---|---|
| committer | James Ross-Gowan <rossymiles@gmail.com> | 2016-03-23 23:15:26 +1100 |
| commit | cd50ebba363315e15276e3b0895c33e85813fc4a (patch) | |
| tree | 272e973f097b9ccc6de93927567c219176fa23ea /options | |
| parent | 5bf473d5ca3b1a8f0902d08799b28512eb81070b (diff) | |
| download | mpv-cd50ebba363315e15276e3b0895c33e85813fc4a.tar.bz2 mpv-cd50ebba363315e15276e3b0895c33e85813fc4a.tar.xz | |
ipc: rename --input-unix-socket to --input-ipc-server
JSON IPC works on Windows now, and although the transports for each
plaform have similar characteristics, they unfortunately have different
names (Unix domain sockets on Linux/Unix vs. named pipes on Windows.)
Hopefully this change better reflects the purpose of the option too,
since with --input-ipc-server, mpv acts as an IPC server that can
service many simultaneous clients (as opposed to --input-file, which can
only do one-to-one IPC.)
Diffstat (limited to 'options')
| -rw-r--r-- | options/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/options/options.c b/options/options.c index ac7d706222..ce43ee376a 100644 --- a/options/options.c +++ b/options/options.c @@ -581,7 +581,7 @@ const m_option_t mp_opts[] = { OPT_FLAG("input-terminal", consolecontrols, CONF_GLOBAL), OPT_STRING("input-file", input_file, M_OPT_FILE | M_OPT_GLOBAL), - OPT_STRING("input-unix-socket", ipc_path, M_OPT_FILE), + OPT_STRING("input-ipc-server", ipc_path, M_OPT_FILE), OPT_SUBSTRUCT("screenshot", screenshot_image_opts, image_writer_conf, 0), OPT_STRING("screenshot-template", screenshot_template, 0), @@ -676,6 +676,7 @@ const m_option_t mp_opts[] = { OPT_REPLACED("dtshd", "ad-spdif-dtshd"), OPT_REPLACED("ass-use-margins", "sub-use-margins"), OPT_REPLACED("media-title", "force-media-title"), + OPT_REPLACED("input-unix-socket", "input-ipc-server"), {0} }; |