From 5d57a338ce8e7b2a2ce2a8bd8886d3bb43a3c0dd Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 4 Jan 2014 19:42:01 +0100 Subject: 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? --- input/event.c | 4 ++-- input/input.c | 6 ++---- input/input.h | 4 ++-- 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, ""); + mp_input_run_cmd(ictx, MP_ON_OSD_AUTO, cmd, ""); } } 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, ""); + mp_input_run_cmd(ictx, MP_ON_OSD_AUTO, cmd, ""); } } } 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; -- cgit v1.2.3