From 5c7ecad93a771d71a773cace996afd706bbef3d2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2018 22:26:48 +0200 Subject: demux: simplify API for returning cache status Instead of going through those weird DEMUXER_CTRLs, query this information directly. I'm not sure which kind of brain damage made me use CTRLs for these. Since there are no other DEMUXER_CTRLs that make sense for the frontend, remove the remaining infrastructure for them too. --- player/osd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'player/osd.c') diff --git a/player/osd.c b/player/osd.c index 7d24c01619..00bef58e6b 100644 --- a/player/osd.c +++ b/player/osd.c @@ -232,8 +232,8 @@ static char *get_term_status_msg(struct MPContext *mpctx) if (mpctx->demuxer && demux_is_network_cached(mpctx->demuxer)) { saddf(&line, " Cache: "); - struct demux_ctrl_reader_state s = {.ts_duration = -1}; - demux_control(mpctx->demuxer, DEMUXER_CTRL_GET_READER_STATE, &s); + struct demux_reader_state s; + demux_get_reader_state(mpctx->demuxer, &s); if (s.ts_duration < 0) { saddf(&line, "???"); -- cgit v1.2.3