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

options: correctly handle things like: dvd://1-2/filename 

The "/filename" part was silently dropped when a range of titles is
specified.
This commit is contained in:
wm4 2013-05-04 09:16:53 +02:00
parent 6a0421295e
commit e5f18eb825
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/parser-mpcmd.c
View File

@ -228,28 +228,30 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files,
} }
} else { } else {
// filename // filename
void *tmp = talloc_new(NULL);
bstr file = p.arg; bstr file = p.arg;
char *file0 = bstrdup0(NULL, p.arg); char *file0 = bstrdup0(tmp, p.arg);
// expand DVD filename entries like dvd://1-3 into component titles // expand DVD filename entries like dvd://1-3 into component titles
if (bstr_startswith0(file, "dvd://")) { if (bstr_startswith0(file, "dvd://")) {
int offset = 6; int offset = 6;
char *splitpos = strstr(file0 + offset, "-"); char *splitpos = strstr(file0 + offset, "-");
if (splitpos != NULL) { if (splitpos != NULL) {
int start_title = strtol(file0 + offset, NULL, 10); char *endpos;
int start_title = strtol(file0 + offset, &endpos, 10);
int end_title; int end_title;
//entries like dvd://-2 imply start at title 1 //entries like dvd://-2 imply start at title 1
if (start_title < 0) { if (start_title < 0) {
end_title = abs(start_title); end_title = abs(start_title);
start_title = 1; start_title = 1;
} else } else
end_title = strtol(splitpos + 1, NULL, 10); end_title = strtol(splitpos + 1, &endpos, 10);
if (dvd_range(start_title) && dvd_range(end_title) if (dvd_range(start_title) && dvd_range(end_title)
&& (start_title < end_title)) { && (start_title < end_title)) {
for (int j = start_title; j <= end_title; j++) { for (int j = start_title; j <= end_title; j++) {
char entbuf[15]; char *f = talloc_asprintf(tmp, "dvd://%d%s", j,
snprintf(entbuf, sizeof(entbuf), "dvd://%d", j); endpos);
playlist_add_file(files, entbuf); playlist_add_file(files, f);
} }
} else } else
mp_tmsg(MSGT_CFGPARSER, MSGL_ERR, mp_tmsg(MSGT_CFGPARSER, MSGL_ERR,
@ -259,7 +261,7 @@ bool m_config_parse_mp_command_line(m_config_t *config, struct playlist *files,
playlist_add_file(files, file0); playlist_add_file(files, file0);
} else } else
playlist_add_file(files, file0); playlist_add_file(files, file0);
talloc_free(file0); talloc_free(tmp);
// Lock stdin if it will be used as input // Lock stdin if it will be used as input
if (bstrcmp0(file, "-") == 0) if (bstrcmp0(file, "-") == 0)