From cd50ebba363315e15276e3b0895c33e85813fc4a Mon Sep 17 00:00:00 2001 From: James Ross-Gowan Date: Fri, 18 Mar 2016 18:46:13 +1100 Subject: 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.) --- options/options.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'options') 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} }; -- cgit v1.2.3