summaryrefslogtreecommitdiffstats
path: root/core/timeline
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-11 21:10:42 +0200
committerwm4 <wm4@nowhere>2013-07-12 21:56:40 +0200
commit52c3eb69765a0d1070bf240353095c8ff546765b (patch)
treedb654a9798f4941dbc3b57c8569fcdeb0b21d24a /core/timeline
parentd17d2fdc7c536821b3fea8c4a37c0ad09fc487db (diff)
downloadmpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.bz2
mpv-52c3eb69765a0d1070bf240353095c8ff546765b.tar.xz
core: change open_stream and demux_open signature
This removes the dependency on DEMUXER_TYPE_* and the file_format parameter from the stream open functions. Remove some of the playlist handling code. It looks like this was needed only for loading linked mov files with demux_mov (which was removed long ago). Delete a minor bit of dead network-related code from stream.c as well.
Diffstat (limited to 'core/timeline')
-rw-r--r--core/timeline/tl_cue.c7
-rw-r--r--core/timeline/tl_edl.c7
-rw-r--r--core/timeline/tl_matroska.c17
3 files changed, 9 insertions, 22 deletions
diff --git a/core/timeline/tl_cue.c b/core/timeline/tl_cue.c
index a965cfd877..1953f46116 100644
--- a/core/timeline/tl_cue.c
+++ b/core/timeline/tl_cue.c
@@ -188,11 +188,10 @@ static bool try_open(struct MPContext *mpctx, char *filename)
|| bstrcasecmp(bstr0(mpctx->demuxer->filename), bfilename) == 0)
return false;
- int format = 0;
- struct stream *s = open_stream(filename, &mpctx->opts, &format);
+ struct stream *s = stream_open(filename, &mpctx->opts);
if (!s)
return false;
- struct demuxer *d = demux_open(&mpctx->opts, s, format, filename);
+ struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts);
// 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
@@ -201,7 +200,7 @@ static bool try_open(struct MPContext *mpctx, char *filename)
// CD sector size (2352 bytes)
if (!d && bstr_case_endswith(bfilename, bstr0(".bin"))) {
mp_msg(MSGT_CPLAYER, MSGL_WARN, "CUE: Opening as BIN file!\n");
- d = demux_open(&mpctx->opts, s, DEMUXER_TYPE_RAWAUDIO, filename);
+ d = demux_open(s, "rawaudio", NULL, &mpctx->opts);
}
if (d) {
add_source(mpctx, d);
diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c
index 0303956513..6096d03b6a 100644
--- a/core/timeline/tl_edl.c
+++ b/core/timeline/tl_edl.c
@@ -354,13 +354,10 @@ void build_edl_timeline(struct MPContext *mpctx)
mpctx->num_sources = 1;
for (int i = 0; i < num_sources; i++) {
- int format = 0;
- struct stream *s = open_stream(edl_ids[i].filename, &mpctx->opts,
- &format);
+ struct stream *s = stream_open(edl_ids[i].filename, &mpctx->opts);
if (!s)
goto openfail;
- struct demuxer *d = demux_open(&mpctx->opts, s, format,
- edl_ids[i].filename);
+ struct demuxer *d = demux_open(s, NULL, NULL, &mpctx->opts);
if (!d) {
free_stream(s);
openfail:
diff --git a/core/timeline/tl_matroska.c b/core/timeline/tl_matroska.c
index 6752b5ff4c..614ce0d6b7 100644
--- a/core/timeline/tl_matroska.c
+++ b/core/timeline/tl_matroska.c
@@ -113,13 +113,6 @@ static char **find_files(const char *original_file, const char *suffix)
return results;
}
-static struct demuxer *open_demuxer(struct stream *stream,
- struct MPContext *mpctx, char *filename, struct demuxer_params *params)
-{
- return demux_open_withparams(&mpctx->opts, stream,
- DEMUXER_TYPE_MATROSKA, NULL, filename, params);
-}
-
static int enable_cache(struct MPContext *mpctx, struct stream **stream,
struct demuxer **demuxer, struct demuxer_params *params)
{
@@ -133,8 +126,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
free_demuxer(*demuxer);
free_stream(*stream);
- int format = 0;
- *stream = open_stream(filename, &mpctx->opts, &format);
+ *stream = stream_open(filename, &mpctx->opts);
if (!*stream) {
talloc_free(filename);
return -1;
@@ -145,7 +137,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream,
opts->stream_cache_min_percent,
opts->stream_cache_seek_min_percent);
- *demuxer = open_demuxer(*stream, mpctx, filename, params);
+ *demuxer = demux_open(*stream, "mkv", params, &mpctx->opts);
if (!*demuxer) {
talloc_free(filename);
free_stream(*stream);
@@ -167,11 +159,10 @@ static bool check_file_seg(struct MPContext *mpctx, struct demuxer **sources,
.matroska_wanted_segment = segment,
.matroska_was_valid = &was_valid,
};
- int format = 0;
- struct stream *s = open_stream(filename, &mpctx->opts, &format);
+ struct stream *s = stream_open(filename, &mpctx->opts);
if (!s)
return false;
- struct demuxer *d = open_demuxer(s, mpctx, filename, &params);
+ struct demuxer *d = demux_open(s, "mkv", &params, &mpctx->opts);
if (!d) {
free_stream(s);