RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-18 05:37:04 +00:00
Code Issues Releases Wiki Activity

player: minor simplification

Browse Source 
This tmp thing had not much of a purpose anymore.
This commit is contained in:
wm4 2015-12-23 15:49:20 +01:00
parent e8960c69e9
commit 2037426a65
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
player/core.h
View File

@ -131,7 +131,7 @@ struct track {
// If the track's stream changes with the timeline (ordered chapters). // If the track's stream changes with the timeline (ordered chapters).
bool under_timeline; bool under_timeline;
// Does not change with under_timeline, but it useless for most purposes. // Does not change with under_timeline, but is useless for most purposes.
struct sh_stream *original_stream; struct sh_stream *original_stream;
// Value can change if under_timeline==true. // Value can change if under_timeline==true.

6
player/loadfile.c
View File

@ -1011,7 +1011,6 @@ static void load_timeline(struct MPContext *mpctx)
static void play_current_file(struct MPContext *mpctx) static void play_current_file(struct MPContext *mpctx)
{ {
struct MPOpts *opts = mpctx->opts; struct MPOpts *opts = mpctx->opts;
void *tmp = talloc_new(NULL);
double playback_start = -1e100; double playback_start = -1e100;
mp_notify(mpctx, MPV_EVENT_START_FILE, NULL); mp_notify(mpctx, MPV_EVENT_START_FILE, NULL);
@ -1045,7 +1044,7 @@ static void play_current_file(struct MPContext *mpctx)
goto terminate_playback; goto terminate_playback;
mpctx->playing->reserved += 1; mpctx->playing->reserved += 1;
mpctx->filename = talloc_strdup(tmp, mpctx->playing->filename); mpctx->filename = talloc_strdup(NULL, mpctx->playing->filename);
mpctx->stream_open_filename = mpctx->filename; mpctx->stream_open_filename = mpctx->filename;
mpctx->add_osd_seek_info &= OSD_SEEK_INFO_EDITION | OSD_SEEK_INFO_CURRENT_FILE; mpctx->add_osd_seek_info &= OSD_SEEK_INFO_EDITION | OSD_SEEK_INFO_CURRENT_FILE;
@ -1305,6 +1304,7 @@ terminate_playback:
if (mpctx->playing) if (mpctx->playing)
playlist_entry_unref(mpctx->playing); playlist_entry_unref(mpctx->playing);
mpctx->playing = NULL; mpctx->playing = NULL;
talloc_free(mpctx->filename);
mpctx->filename = NULL; mpctx->filename = NULL;
mpctx->stream_open_filename = NULL; mpctx->stream_open_filename = NULL;
@ -1315,8 +1315,6 @@ terminate_playback:
} else { } else {
mpctx->files_played++; mpctx->files_played++;
} }
talloc_free(tmp);
} }
// Determine the next file to play. Note that if this function returns non-NULL, // Determine the next file to play. Note that if this function returns non-NULL,