summaryrefslogtreecommitdiffstats
path: root/demux/demux_timeline.c
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 /demux/demux_timeline.c
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 'demux/demux_timeline.c')
-rw-r--r--demux/demux_timeline.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
index 359f97f2bc..d7a5c36d70 100644
--- a/demux/demux_timeline.c
+++ b/demux/demux_timeline.c
@@ -363,6 +363,7 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
demuxer->editions = meta->editions;
demuxer->num_editions = meta->num_editions;
demuxer->edition = meta->edition;
+ demuxer->duration = p->duration;
int num_streams = demux_get_num_stream(meta);
for (int n = 0; n < num_streams; n++) {
@@ -431,17 +432,11 @@ static void d_close(struct demuxer *demuxer)
static int d_control(struct demuxer *demuxer, int cmd, void *arg)
{
- struct priv *p = demuxer->priv;
-
- switch (cmd) {
- case DEMUXER_CTRL_GET_TIME_LENGTH: {
- *(double *)arg = p->duration;
- return CONTROL_OK;
- }
- case DEMUXER_CTRL_SWITCHED_TRACKS:
+ if (cmd == DEMUXER_CTRL_SWITCHED_TRACKS) {
reselect_streams(demuxer);
return CONTROL_OK;
}
+
return CONTROL_UNKNOWN;
}