diff options
author | wm4 <wm4@nowhere> | 2016-01-21 22:24:20 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-22 00:25:44 +0100 |
commit | 7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e (patch) | |
tree | 6454f416b7ef2c5612ba1b4bdc66a0839530e1f5 /player/playloop.c | |
parent | fef8b7984be5a6244612d346bd60d2badd4a2e63 (diff) | |
download | mpv-7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e.tar.bz2 mpv-7bb9203f7fec1ad4e40a7ae58d68b604c0a4565e.tar.xz |
player: refactor: eliminate MPContext.d_audio
Diffstat (limited to 'player/playloop.c')
-rw-r--r-- | player/playloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/player/playloop.c b/player/playloop.c index 761fb21c11..6f4521b32a 100644 --- a/player/playloop.c +++ b/player/playloop.c @@ -97,7 +97,7 @@ void pause_player(struct MPContext *mpctx) mpctx->osd_force_update = true; mpctx->paused_for_cache = false; - if (mpctx->ao && mpctx->d_audio) + if (mpctx->ao && mpctx->ao_chain) ao_pause(mpctx->ao); if (mpctx->video_out) vo_set_paused(mpctx->video_out, true); @@ -122,7 +122,7 @@ void unpause_player(struct MPContext *mpctx) mpctx->osd_function = 0; mpctx->osd_force_update = true; - if (mpctx->ao && mpctx->d_audio) + if (mpctx->ao && mpctx->ao_chain) ao_resume(mpctx->ao); if (mpctx->video_out) vo_set_paused(mpctx->video_out, false); @@ -905,7 +905,7 @@ static void handle_segment_switch(struct MPContext *mpctx, bool end_is_new_segme * and video streams to "disabled" at runtime. Handle this by waiting * rather than immediately stopping playback due to EOF. */ - if ((mpctx->d_audio || mpctx->vo_chain) && !prevent_eof && + if ((mpctx->ao_chain || mpctx->vo_chain) && !prevent_eof && mpctx->audio_status == STATUS_EOF && mpctx->video_status == STATUS_EOF) { |