diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-08 00:54:32 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-08 18:05:12 +0200 |
| commit | 9a663ffec62720931f34ae2742a32652d1de5f8e (patch) | |
| tree | 6fe61b81610e178b760f3a5f4e0403fe4690d23b /libmpdemux/demux_demuxers.c | |
| parent | 3628a903f40943740ff97a03a106d9a5208fae76 (diff) | |
| download | mpv-9a663ffec62720931f34ae2742a32652d1de5f8e.tar.bz2 mpv-9a663ffec62720931f34ae2742a32652d1de5f8e.tar.xz | |
core: move video pos/length query functions from demux to core
Move functions to query current playback position, percentage position
and total video length from from the demuxer layer to top level. The
functions need access to playback state that doesn't belong on the
demuxing level. Make the new functions more capable and simplify some
code that can now rely on them. This fixes some errors in displayed in
OSD and slave mode information when using timeline (ordered chapters).
Diffstat (limited to 'libmpdemux/demux_demuxers.c')
| -rw-r--r-- | libmpdemux/demux_demuxers.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmpdemux/demux_demuxers.c b/libmpdemux/demux_demuxers.c index 531f048508..906ea402c5 100644 --- a/libmpdemux/demux_demuxers.c +++ b/libmpdemux/demux_demuxers.c @@ -151,11 +151,8 @@ static int demux_demuxers_control(demuxer_t *demuxer,int cmd, void *arg){ dd_priv_t* priv = demuxer->priv; switch (cmd) { case DEMUXER_CTRL_GET_TIME_LENGTH: - *((double *)arg) = demuxer_get_time_length(priv->vd); - return DEMUXER_CTRL_OK; case DEMUXER_CTRL_GET_PERCENT_POS: - *((int *)arg) = demuxer_get_percent_pos(priv->vd); - return DEMUXER_CTRL_OK; + return demux_control(priv->vd, cmd, arg); } return DEMUXER_CTRL_NOTIMPL; } |