From 6aa6778ac46672dd237acc86856353d133917f06 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 20 Feb 2015 21:21:14 +0100 Subject: demux: change demux_open() signature Fold the relatively obscure force_format parameter into demuxer_params. --- demux/demux_cue.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'demux/demux_cue.c') diff --git a/demux/demux_cue.c b/demux/demux_cue.c index db70586b16..93c842dc0d 100644 --- a/demux/demux_cue.c +++ b/demux/demux_cue.c @@ -195,7 +195,7 @@ static bool try_open(struct timeline *tl, char *filename) struct stream *s = stream_open(filename, tl->global); if (!s) return false; - struct demuxer *d = demux_open(s, NULL, NULL, tl->global); + struct demuxer *d = demux_open(s, NULL, tl->global); // Since .bin files are raw PCM data with no headers, we have to explicitly // open them. Also, try to avoid to open files that are most likely not .bin // files, as that would only play noise. Checking the file extension is @@ -204,7 +204,8 @@ static bool try_open(struct timeline *tl, char *filename) // CD sector size (2352 bytes) if (!d && bstr_case_endswith(bfilename, bstr0(".bin"))) { MP_WARN(tl, "CUE: Opening as BIN file!\n"); - d = demux_open(s, "rawaudio", NULL, tl->global); + struct demuxer_params p = {.force_format = "rawaudio"}; + d = demux_open(s, &p, tl->global); } if (d) { add_source(tl, d); -- cgit v1.2.3