From f34e1a0deea45e5ed200f1d8daa36ca92d899e92 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 19 Jun 2017 17:54:02 +0200 Subject: demux: replace custom return codes with CONTROL_ ones This is more uniform, and potentially gets rid of some past copyrights. It might be that this subtly changes caching behavior (it seems before this, it synced to the demuxer if the length was unknown, which is not what we want.) --- demux/demux_disc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'demux/demux_disc.c') diff --git a/demux/demux_disc.c b/demux/demux_disc.c index ad54db8c19..f4c9c34332 100644 --- a/demux/demux_disc.c +++ b/demux/demux_disc.c @@ -357,14 +357,14 @@ static int d_control(demuxer_t *demuxer, int cmd, void *arg) if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &len) < 1) break; *(double *)arg = len; - return DEMUXER_CTRL_OK; + return CONTROL_OK; } case DEMUXER_CTRL_RESYNC: demux_flush(p->slave); break; // relay to slave demuxer case DEMUXER_CTRL_SWITCHED_TRACKS: reselect_streams(demuxer); - return DEMUXER_CTRL_OK; + return CONTROL_OK; } return demux_control(p->slave, cmd, arg); } -- cgit v1.2.3