summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYour Name <you@example.com>2021-05-07 14:48:52 +0200
committerYour Name <you@example.com>2021-05-07 15:01:14 +0200
commitfce994bdc473e73873fb8e9f4841004d073f43b4 (patch)
tree4303f7954b9860b24ffc40d5ede897cc3bf22276
parentdd4d239bcb151b08eb81b38486515a3e1222e1f5 (diff)
downloadmpv-fce994bdc473e73873fb8e9f4841004d073f43b4.tar.bz2
mpv-fce994bdc473e73873fb8e9f4841004d073f43b4.tar.xz
Revert "audio: set audio chain ao on reinit"
This reverts commit 3239e41277173bace5ecc2a22910c4660642429c. I'm fairly sure this is wrong, and my next commit should fix it properly. I'm not really sure, though. Normally, the AO is set again by reinit_audio_filters_and_output() after the new audio chain has decoded a frame and knows the new format. The reason replaygain (and apparently the thing the reverted commit tried to fix) didn't work is because they work asynchronously to the audio played by the AO (i.e. buggy and hard to fix).
-rw-r--r--player/audio.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/player/audio.c b/player/audio.c
index aa7647428c..c468df6719 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -568,10 +568,8 @@ void reinit_audio_chain_src(struct MPContext *mpctx, struct track *track)
if (recreate_audio_filters(mpctx) < 0)
goto init_error;
- if (mpctx->ao) {
- ao_chain_set_ao(ao_c, mpctx->ao);
+ if (mpctx->ao)
audio_update_volume(mpctx);
- }
mp_wakeup_core(mpctx);
return;