summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-06-20 13:57:58 +0200
committerwm4 <wm4@nowhere>2017-06-20 14:22:10 +0200
commit1890529857a3b963df476f53ca41faacab48a6d2 (patch)
treecad31a2b753e5aa2040dd8d8d8adc34ececebea0 /player
parent5bfbe6dfde01704979dd086d5184ea2e697cb510 (diff)
downloadmpv-1890529857a3b963df476f53ca41faacab48a6d2.tar.bz2
mpv-1890529857a3b963df476f53ca41faacab48a6d2.tar.xz
demux: get rid of DEMUXER_CTRL_GET_TIME_LENGTH
Similar purpose as f34e1a0deea45e. Somehow this is much more natural too, and needs less code. This breaks runtime updates to duration. This could easily be fixed, but no important demuxer does this anyway. Only demux_raw and demux_disc might (the latter for BD/DVD). For the latter it might actually have some importance when changing titles at runtime (I guess?), but guess what, I don't care.
Diffstat (limited to 'player')
-rw-r--r--player/playloop.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/player/playloop.c b/player/playloop.c
index 09387ed66f..19ff2f2f2e 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -441,14 +441,7 @@ void execute_queued_seek(struct MPContext *mpctx)
double get_time_length(struct MPContext *mpctx)
{
struct demuxer *demuxer = mpctx->demuxer;
- if (!demuxer)
- return -1;
-
- double len = demuxer_get_time_length(demuxer);
- if (len >= 0)
- return len;
-
- return -1; // unknown
+ return demuxer ? demuxer->duration : -1;
}
double get_current_time(struct MPContext *mpctx)