diff options
| author | wm4 <wm4@nowhere> | 2014-07-06 19:05:59 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-07-06 19:05:59 +0200 |
| commit | acd60736ef62c7ea681d69c0c7b26142509aa1cb (patch) | |
| tree | 98288002d978dd5f64dbd0f8603e42ec120f9511 /player | |
| parent | a90b5cfddf88f73b0b46318e817b00aa6658371d (diff) | |
| download | mpv-acd60736ef62c7ea681d69c0c7b26142509aa1cb.tar.bz2 mpv-acd60736ef62c7ea681d69c0c7b26142509aa1cb.tar.xz | |
Remove stream_pts stuff
This was used by DVD/BD, but its usage was removed with one of the
previous commits.
Diffstat (limited to 'player')
| -rw-r--r-- | player/command.c | 17 | ||||
| -rw-r--r-- | player/playloop.c | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/player/command.c b/player/command.c index 9f8a830058..159367a028 100644 --- a/player/command.c +++ b/player/command.c @@ -335,22 +335,6 @@ static int property_time(int action, void *arg, double time) return M_PROPERTY_NOT_IMPLEMENTED; } -/// Current stream position in seconds (RO) -static int mp_property_stream_time_pos(void *ctx, struct m_property *prop, - int action, void *arg) -{ - MPContext *mpctx = ctx; - struct demuxer *demuxer = mpctx->demuxer; - if (!demuxer) - return M_PROPERTY_UNAVAILABLE; - double pts = demuxer->stream_pts; - if (pts == MP_NOPTS_VALUE) - return M_PROPERTY_UNAVAILABLE; - - return property_time(action, arg, pts); -} - - /// Media length in seconds (RO) static int mp_property_length(void *ctx, struct m_property *prop, int action, void *arg) @@ -2658,7 +2642,6 @@ static const struct m_property mp_properties[] = { {"demuxer", mp_property_demuxer}, {"stream-pos", mp_property_stream_pos}, {"stream-end", mp_property_stream_end}, - {"stream-time-pos", mp_property_stream_time_pos}, {"length", mp_property_length}, {"avsync", mp_property_avsync}, {"total-avsync-change", mp_property_total_avsync_change}, diff --git a/player/playloop.c b/player/playloop.c index e975e57413..b3b3687c22 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -417,8 +417,6 @@ double get_current_time(struct MPContext *mpctx) struct demuxer *demuxer = mpctx->demuxer; if (!demuxer) return 0; - if (demuxer->stream_pts != MP_NOPTS_VALUE) - return demuxer->stream_pts; if (mpctx->playback_pts != MP_NOPTS_VALUE) return mpctx->playback_pts; if (mpctx->last_seek_pts != MP_NOPTS_VALUE) |