diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 20:36:45 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 21:43:16 +0100 |
| commit | 0335011f11d9d13f70db6c46ed6189a74d48ec67 (patch) | |
| tree | 03a146b06b5a8c405f5c521abadeeea35c296920 /player | |
| parent | 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b (diff) | |
| download | mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.bz2 mpv-0335011f11d9d13f70db6c46ed6189a74d48ec67.tar.xz | |
stream: mp_msg conversions
We also drop some slave mode stuff from stream_vcd.
Diffstat (limited to 'player')
| -rw-r--r-- | player/loadfile.c | 4 | ||||
| -rw-r--r-- | player/timeline/tl_cue.c | 2 | ||||
| -rw-r--r-- | player/timeline/tl_matroska.c | 4 | ||||
| -rw-r--r-- | player/timeline/tl_mpv_edl.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/player/loadfile.c b/player/loadfile.c index 1d668b9c2c..63c83e64e4 100644 --- a/player/loadfile.c +++ b/player/loadfile.c @@ -724,7 +724,7 @@ static struct track *open_external_file(struct MPContext *mpctx, char *filename, char *disp_filename = filename; if (strncmp(disp_filename, "memory://", 9) == 0) disp_filename = "memory://"; // avoid noise - struct stream *stream = stream_open(filename, mpctx->opts); + struct stream *stream = stream_open(filename, mpctx->global); if (!stream) goto err_out; stream_enable_cache_percent(&stream, stream_cache, @@ -1046,7 +1046,7 @@ static void play_current_file(struct MPContext *mpctx) } stream_filename = mpctx->resolve_result->url; } - mpctx->stream = stream_open(stream_filename, opts); + mpctx->stream = stream_open(stream_filename, mpctx->global); if (!mpctx->stream) { // error... demux_was_interrupted(mpctx); goto terminate_playback; diff --git a/player/timeline/tl_cue.c b/player/timeline/tl_cue.c index 80eaf5ef76..6731ab4058 100644 --- a/player/timeline/tl_cue.c +++ b/player/timeline/tl_cue.c @@ -188,7 +188,7 @@ static bool try_open(struct MPContext *mpctx, char *filename) || bstrcasecmp(bstr0(mpctx->demuxer->filename), bfilename) == 0) return false; - struct stream *s = stream_open(filename, mpctx->opts); + struct stream *s = stream_open(filename, mpctx->global); if (!s) return false; struct demuxer *d = demux_open(s, NULL, NULL, mpctx->global); diff --git a/player/timeline/tl_matroska.c b/player/timeline/tl_matroska.c index 720bd3f979..59dc024e14 100644 --- a/player/timeline/tl_matroska.c +++ b/player/timeline/tl_matroska.c @@ -127,7 +127,7 @@ static int enable_cache(struct MPContext *mpctx, struct stream **stream, free_demuxer(*demuxer); free_stream(*stream); - *stream = stream_open(filename, opts); + *stream = stream_open(filename, mpctx->global); if (!*stream) { talloc_free(filename); return -1; @@ -174,7 +174,7 @@ static bool check_file_seg(struct MPContext *mpctx, struct demuxer ***sources, .matroska_wanted_segment = segment, .matroska_was_valid = &was_valid, }; - struct stream *s = stream_open(filename, mpctx->opts); + struct stream *s = stream_open(filename, mpctx->global); if (!s) return false; struct demuxer *d = demux_open(s, "mkv", ¶ms, mpctx->global); diff --git a/player/timeline/tl_mpv_edl.c b/player/timeline/tl_mpv_edl.c index b256e0bdd5..651c937c23 100644 --- a/player/timeline/tl_mpv_edl.c +++ b/player/timeline/tl_mpv_edl.c @@ -123,7 +123,7 @@ static struct demuxer *open_file(char *filename, struct MPContext *mpctx) { struct MPOpts *opts = mpctx->opts; struct demuxer *d = NULL; - struct stream *s = stream_open(filename, opts); + struct stream *s = stream_open(filename, mpctx->global); if (s) { stream_enable_cache_percent(&s, opts->stream_cache_size, |