summaryrefslogtreecommitdiffstats
path: root/core/playlist_parser.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-11-15 18:49:17 +0100
committerwm4 <wm4@nowhere>2012-11-16 21:21:15 +0100
commit51503a05778290edc0bb77276b67d33ca0e10783 (patch)
tree4745d8d476e788fe0a36c1151dd28118cac0a911 /core/playlist_parser.c
parentb4b86e9286ba175ba0da4d19e165660bed7002e4 (diff)
downloadmpv-51503a05778290edc0bb77276b67d33ca0e10783.tar.bz2
mpv-51503a05778290edc0bb77276b67d33ca0e10783.tar.xz
options: rename -ss and -endpos, allow relative times
Rename the -ss option to -start, and -endpos to -length. Add a -end option. The -end option always specifies an absolute end time, as opposed to -endpos/-length. All these options (--start, --end, --length) now accept relative times. Percent positions (e.g. "--start=30%") are interpreted as fractions of the file duration. Negative times (e.g. "--start=-1:00) are interpreted relative to the end of the file. Chapters (e.g. "--start=#3") yield the chapter's time position. The chapter support might be able to replace --chapter completely, but for now I am not sure how well this works out with e.g. DVDs and BDs, and a separate --chapter option is useful interface-wise.
Diffstat (limited to 'core/playlist_parser.c')
-rw-r--r--core/playlist_parser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/playlist_parser.c b/core/playlist_parser.c
index 98eebaa47e..67d58024c1 100644
--- a/core/playlist_parser.c
+++ b/core/playlist_parser.c
@@ -359,7 +359,7 @@ static bool parse_pls(play_tree_parser_t* p) {
mp_msg(MSGT_PLAYTREE,MSGL_DBG2,"Adding entry %s\n",entries[num].file);
playlist_add_file(p->pl,entries[num].file);
if (entries[num].length)
- playlist_entry_add_param(p->pl->last, bstr0("endpos"), bstr0(entries[num].length));
+ playlist_entry_add_param(p->pl->last, bstr0("end"), bstr0(entries[num].length));
free(entries[num].file);
}
// When we have info in playtree we add these info