summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2014-10-15 17:48:47 +0200
committerAlessandro Ghedini <alessandro@ghedini.me>2014-10-17 20:47:43 +0200
commit3deb6c3d4f49bd8933c2cab2e58752f6d0a33c6e (patch)
treeaa3fdc29dd79dd3fb7b8dcac4fc21a02300dd8d9 /input/input.c
parente0f0f6fe26b7f8d941a20f2c86564b83e5fb52cb (diff)
downloadmpv-3deb6c3d4f49bd8933c2cab2e58752f6d0a33c6e.tar.bz2
mpv-3deb6c3d4f49bd8933c2cab2e58752f6d0a33c6e.tar.xz
input: implement --input-file on unix using the IPC support
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/input/input.c b/input/input.c
index 613d1ec3b0..c9a5bbe99c 100644
--- a/input/input.c
+++ b/input/input.c
@@ -165,7 +165,6 @@ struct input_opts {
int ar_delay;
int ar_rate;
char *js_dev;
- char *in_file;
int use_joystick;
int use_lirc;
char *lirc_configfile;
@@ -188,7 +187,6 @@ const struct m_sub_options input_config = {
OPT_PRINT("keylist", mp_print_key_list),
OPT_PRINT("cmdlist", mp_print_cmd_list),
OPT_STRING("js-dev", js_dev, CONF_GLOBAL),
- OPT_STRING("file", in_file, CONF_GLOBAL),
OPT_FLAG("default-bindings", default_bindings, CONF_GLOBAL),
OPT_FLAG("test", test, CONF_GLOBAL),
OPT_INTRANGE("doubleclick-time", doubleclick_time, 0, 0, 1000),
@@ -1296,13 +1294,14 @@ void mp_input_load(struct input_ctx *ictx)
ictx->win_drag = ictx->global->opts->allow_win_drag;
- if (input_conf->in_file && input_conf->in_file[0]) {
-#if !defined(__MINGW32__) || HAVE_WAIO
- mp_input_pipe_add(ictx, input_conf->in_file);
+#if defined(__MINGW32__)
+ if (ictx->global->opts->input_file && *ictx->global->opts->input_file)
+#if HAVE_WAIO
+ mp_input_pipe_add(ictx, ictx->global->opts->input_file);
#else
MP_ERR(ictx, "Pipes not available.\n");
#endif
- }
+#endif
}
static void clear_queue(struct cmd_queue *queue)