summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-01-04 19:42:01 +0100
committerwm4 <wm4@nowhere>2014-01-04 19:42:16 +0100
commit5d57a338ce8e7b2a2ce2a8bd8886d3bb43a3c0dd (patch)
tree5d2e8783cfbe668f25f33c05e14455a862c6c5ce /input
parent7c6bb321eb0542c474e5147558fb71ecf2d44bd4 (diff)
downloadmpv-5d57a338ce8e7b2a2ce2a8bd8886d3bb43a3c0dd.tar.bz2
mpv-5d57a338ce8e7b2a2ce2a8bd8886d3bb43a3c0dd.tar.xz
input: change mp_input_run_cmd signature
I don't like this function at all, but it's basically a trick to get the input's mp_log instance in a case the mp_input_parse_cmd_strv() is almost certainly not going to output anything. But still make it somewhat more consistent with mp_input_parse_cmd_strv() - why force the caller to always use MP_ON_OSD_AUTO?
Diffstat (limited to 'input')
-rw-r--r--input/event.c4
-rw-r--r--input/input.c6
-rw-r--r--input/input.h4
3 files changed, 6 insertions, 8 deletions
diff --git a/input/event.c b/input/event.c
index e2d488b5ca..661a68ecf3 100644
--- a/input/event.c
+++ b/input/event.c
@@ -33,7 +33,7 @@ void mp_event_drop_files(struct input_ctx *ictx, int num_files, char **files)
files[i],
NULL
};
- mp_input_run_cmd(ictx, cmd, "<drop-subtitle>");
+ mp_input_run_cmd(ictx, MP_ON_OSD_AUTO, cmd, "<drop-subtitle>");
}
} else {
for (int i = 0; i < num_files; i++) {
@@ -44,7 +44,7 @@ void mp_event_drop_files(struct input_ctx *ictx, int num_files, char **files)
(i == 0) ? "replace" : "append",
NULL
};
- mp_input_run_cmd(ictx, cmd, "<drop-files>");
+ mp_input_run_cmd(ictx, MP_ON_OSD_AUTO, cmd, "<drop-files>");
}
}
}
diff --git a/input/input.c b/input/input.c
index 620bd17396..42b45b842f 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1661,11 +1661,9 @@ struct mp_cmd *mp_input_parse_cmd(struct input_ctx *ictx, bstr str,
return mp_input_parse_cmd_(ictx->log, str, location);
}
-void mp_input_run_cmd(struct input_ctx *ictx, const char **cmd,
+void mp_input_run_cmd(struct input_ctx *ictx, int def_flags, const char **cmd,
const char *location)
{
- mp_cmd_t *cmdt = mp_input_parse_cmd_strv(ictx->log,
- MP_ON_OSD_AUTO,
- cmd, location);
+ mp_cmd_t *cmdt = mp_input_parse_cmd_strv(ictx->log, def_flags, cmd, location);
mp_input_queue_cmd(ictx, cmdt);
}
diff --git a/input/input.h b/input/input.h
index de9d143265..55fd4875de 100644
--- a/input/input.h
+++ b/input/input.h
@@ -210,8 +210,8 @@ int mp_input_check_interrupt(struct input_ctx *ictx, int time);
// characters. If false, count Right Alt as the modifier Alt key.
bool mp_input_use_alt_gr(struct input_ctx *ictx);
-// Runs a command parsing the input string array
-void mp_input_run_cmd(struct input_ctx *ictx, const char **cmd,
+// Like mp_input_parse_cmd_strv, but also run the command.
+void mp_input_run_cmd(struct input_ctx *ictx, int def_flags, const char **cmd,
const char *location);
extern int async_quit_request;