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

options: change --sub-file behavior 

--sub-file is actually a string list, so you can add multipel external
subtitle files. But to be able to set a list, the option value was split
on ",". This made it impossible to add filenames.

One possible solution would be adding escaping. That's probably a good
idea (and some other options already do this), but it's also complicated
both to implement and for the user.

The simpler solution is making --sub-file appending, and make it take
only a single entry.

I'm not quite sure about this yet. It breaks the invariant that if a
value is printed and parsed, you get the same value back. So for now,
just go with the simple solution.

Fixes #840.
This commit is contained in:
wm4 2014-06-07 23:41:47 +02:00
parent 5cc68c792b
commit 924d4db0de
3 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
options/m_option.c
View File

@ -1344,6 +1344,42 @@ const m_option_type_t m_option_type_string_list = {
.set = str_list_set,
};
static void str_list_append(void *dst, bstr s)
{
if (!dst)
return;
char **list= VAL(dst);
int len = 0;
while (list && list[len])
len++;
MP_TARRAY_APPEND(NULL, list, len, bstrto0(NULL, s));
MP_TARRAY_APPEND(NULL, list, len, NULL);
VAL(dst) = list;
}
static int parse_str_append_list(struct mp_log *log, const m_option_t *opt,
struct bstr name, struct bstr param, void *dst)
{
if (param.len == 0)
return M_OPT_MISSING_PARAM;
str_list_append(dst, param);
return 1;
}
const m_option_type_t m_option_type_string_append_list = {
.name = "String list",
.size = sizeof(char **),
.flags = M_OPT_TYPE_DYNAMIC,
.parse = parse_str_append_list,
.print = print_str_list,
.copy = copy_str_list,
.free = free_str_list,
.get = str_list_get,
.set = str_list_set,
};
static int read_subparam(struct mp_log *log, bstr optname,
bstr *str, bstr *out_subparam);

4
options/m_option.h
View File

@ -47,6 +47,7 @@ extern const m_option_type_t m_option_type_float;
extern const m_option_type_t m_option_type_double;
extern const m_option_type_t m_option_type_string;
extern const m_option_type_t m_option_type_string_list;
extern const m_option_type_t m_option_type_string_append_list;
extern const m_option_type_t m_option_type_keyvalue_list;
extern const m_option_type_t m_option_type_time;
extern const m_option_type_t m_option_type_rel_time;
@ -575,6 +576,9 @@ extern const char m_option_path_separator;
#define OPT_STRINGLIST(...) \
OPT_GENERAL(char**, __VA_ARGS__, .type = &m_option_type_string_list)
#define OPT_STRING_APPEND_LIST(...) \
OPT_GENERAL(char**, __VA_ARGS__, .type = &m_option_type_string_append_list)
#define OPT_KEYVALUELIST(...) \
OPT_GENERAL(char**, __VA_ARGS__, .type = &m_option_type_keyvalue_list)

2
options/options.c
View File

@ -396,7 +396,7 @@ const m_option_t mp_opts[] = {
// ------------------------- subtitles options --------------------
OPT_STRINGLIST("sub-file", sub_name, 0),
OPT_STRING_APPEND_LIST("sub-file", sub_name, 0),
OPT_PATHLIST("sub-paths", sub_paths, 0),
OPT_STRING("sub-codepage", sub_cp, 0),
OPT_FLOAT("sub-delay", sub_delay, 0),