RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

player: remove unused MPContext.stream field 

It was just dead code.

Also fixes the stream-open-filename property, which is supposed to be
read-only if a file was already opened.
This commit is contained in:
wm4 2016-02-23 22:15:10 +01:00
parent 36c6c0f79b
commit b5f620ae75
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player/command.c
View File

@ -350,7 +350,7 @@ static int mp_property_stream_open_filename(void *ctx, struct m_property *prop,
return M_PROPERTY_UNAVAILABLE;
switch (action) {
case M_PROPERTY_SET: {
if (mpctx->stream)
if (mpctx->demuxer)
return M_PROPERTY_ERROR;
mpctx->stream_open_filename =
talloc_strdup(mpctx->stream_open_filename, *(char **)arg);

2
player/core.h
View File

@ -273,8 +273,6 @@ typedef struct MPContext {
// Current file statistics
int64_t shown_vframes, shown_aframes;
struct stream *stream; // stream that was initially opened
struct demux_chapter *chapters;
int num_chapters;

8
player/loadfile.c
View File

@ -83,12 +83,6 @@ static void uninit_demuxer(struct MPContext *mpctx)
mpctx->demuxer = NULL;
}
static void uninit_stream(struct MPContext *mpctx)
{
free_stream(mpctx->stream);
mpctx->stream = NULL;
}
#define APPEND(s, ...) mp_snprintf_cat(s, sizeof(s), __VA_ARGS__)
static void print_stream(struct MPContext *mpctx, struct track *t)
@ -1047,7 +1041,6 @@ static void play_current_file(struct MPContext *mpctx)
reopen_file:
assert(mpctx->stream == NULL);
assert(mpctx->demuxer == NULL);
if (process_open_hooks(mpctx) < 0)
@ -1215,7 +1208,6 @@ terminate_playback:
uninit_video_chain(mpctx);
uninit_sub_all(mpctx);
uninit_demuxer(mpctx);
uninit_stream(mpctx);
if (!opts->gapless_audio && !mpctx->encode_lavc_ctx)
uninit_audio_out(mpctx);