RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

input: accept input command prefixes in any order 

This is more consistent, and doesn't bother the user with ordering
rules when new prefixes are added.

Will break obscure uses of legacy commands: if the command is supposed
to be translated by the legacy command bridge, and if that command uses
one of the pausing* prefixes, the command can't be parsed. Well, just
use the new commands in this case.
This commit is contained in:
wm4 2013-05-18 12:53:38 +02:00
parent b0a60b7321
commit 3e6ec6dfa5
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/input/input.c
View File

@ -794,16 +794,6 @@ mp_cmd_t *mp_input_parse_cmd(bstr str, const char *loc)
bstr start = str; bstr start = str;
void *tmp = talloc_new(NULL); void *tmp = talloc_new(NULL);
if (eat_token(&str, "pausing")) {
pausing = 1;
} else if (eat_token(&str, "pausing_keep")) {
pausing = 2;
} else if (eat_token(&str, "pausing_toggle")) {
pausing = 3;
} else if (eat_token(&str, "pausing_keep_force")) {
pausing = 4;
}
str = bstr_lstrip(str); str = bstr_lstrip(str);
for (const struct legacy_cmd *entry = legacy_cmds; entry->old; entry++) { for (const struct legacy_cmd *entry = legacy_cmds; entry->old; entry++) {
size_t old_len = strlen(entry->old); size_t old_len = strlen(entry->old);
@ -820,7 +810,16 @@ mp_cmd_t *mp_input_parse_cmd(bstr str, const char *loc)
} }
} }
if (eat_token(&str, "no-osd")) { while (1) {
if (eat_token(&str, "pausing")) {
pausing = 1;
} else if (eat_token(&str, "pausing_keep")) {
pausing = 2;
} else if (eat_token(&str, "pausing_toggle")) {
pausing = 3;
} else if (eat_token(&str, "pausing_keep_force")) {
pausing = 4;
} else if (eat_token(&str, "no-osd")) {
on_osd = MP_ON_OSD_NO; on_osd = MP_ON_OSD_NO;
} else if (eat_token(&str, "osd-bar")) { } else if (eat_token(&str, "osd-bar")) {
on_osd = MP_ON_OSD_BAR; on_osd = MP_ON_OSD_BAR;
@ -830,6 +829,9 @@ mp_cmd_t *mp_input_parse_cmd(bstr str, const char *loc)
on_osd = MP_ON_OSD_MSG | MP_ON_OSD_BAR; on_osd = MP_ON_OSD_MSG | MP_ON_OSD_BAR;
} else if (eat_token(&str, "osd-auto")) { } else if (eat_token(&str, "osd-auto")) {
// default // default
} else {
break;
}
} }
int cmd_idx = 0; int cmd_idx = 0;