summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-09 09:54:39 +0100
committerwm4 <wm4@nowhere>2014-11-09 09:54:39 +0100
commit7ee4e533693ee02e660ae0efb2e0e94db8c8c5af (patch)
tree677028667932f825f5f6fbaed2b26a45eec793b7
parent4235aab8974ef4e72e2b7ccdc7d8dee3750d3333 (diff)
downloadmpv-7ee4e533693ee02e660ae0efb2e0e94db8c8c5af.tar.bz2
mpv-7ee4e533693ee02e660ae0efb2e0e94db8c8c5af.tar.xz
audio: handle reinit after AO reload slightly cleaner
Don't print bogus messages about packets read in verbose mode.
-rw-r--r--player/audio.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/player/audio.c b/player/audio.c
index 75989bfe20..8df6053da1 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -443,14 +443,14 @@ static void do_fill_audio_out_buffers(struct MPContext *mpctx, double endpts)
int r = initial_audio_decode(mpctx->d_audio);
if (r == AD_WAIT)
return; // continue later when new data is available
- mpctx->d_audio->init_retries += 1;
- MP_VERBOSE(mpctx, "Initial audio packets read: %d\n",
- mpctx->d_audio->init_retries);
- if (r != AD_OK && mpctx->d_audio->init_retries >= 50) {
- MP_ERR(mpctx, "Error initializing audio.\n");
- struct track *track = mpctx->current_track[0][STREAM_AUDIO];
- mp_deselect_track(mpctx, track);
- return;
+ if (r != AD_OK) {
+ mpctx->d_audio->init_retries += 1;
+ if (mpctx->d_audio->init_retries >= 50) {
+ MP_ERR(mpctx, "Error initializing audio.\n");
+ struct track *track = mpctx->current_track[0][STREAM_AUDIO];
+ mp_deselect_track(mpctx, track);
+ return;
+ }
}
reinit_audio_chain(mpctx);
mpctx->sleeptime = 0;