Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

player: simplify audio uninit on segment switches

Browse Source 
The purpose of temporarily setting stop_play was to make the audio
uninit code to explicitly drain audio if needed. This was the only way
to do it before ao_drain() was made a separate function; now we can just
do it explicitly instead.
This commit is contained in:
wm4
2014-11-12 17:37:03 +01:00
parent f0efd0b100
commit a9ece6371f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
player/loadfile.c
View File

@@ -252,17 +252,16 @@ bool timeline_set_part(struct MPContext *mpctx, int i, bool force)
mpctx->video_offset = n->start - n->source_start;
if (n->source == p->source && !force)
return false;
enum stop_play_reason orig_stop_play = mpctx->stop_play;
if (!mpctx->d_video && mpctx->stop_play == KEEP_PLAYING)
mpctx->stop_play = AT_END_OF_FILE; // let audio uninit drain data
uninit_audio_chain(mpctx);
uninit_video_chain(mpctx);
uninit_sub_all(mpctx);
if (!mpctx->opts->fixed_vo)
uninit_video_out(mpctx);
if (!mpctx->opts->gapless_audio)
if (mpctx->ao && !mpctx->opts->gapless_audio) {
ao_drain(mpctx->ao);
uninit_audio_out(mpctx);
mpctx->stop_play = orig_stop_play;
}
if (mpctx->demuxer) {
demux_stop_thread(mpctx->demuxer);