oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

OutputControl: fix fail_timer check right after booting

Browse Source 
Right after booting, the monotonic clock starts with a very small
value, and AudioOutput::LockUpdate() may believe that the fail_timer
has not recovered yet.
This commit is contained in:
Romain Rollet 2015-06-20 15:37:19 +02:00 committed by Max Kellermann
parent 980187f856
commit ae77542a11
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -6,6 +6,8 @@ ver 0.19.10 (not yet released)
- ffmpeg: improve seeking accuracy - ffmpeg: improve seeking accuracy
* encoder * encoder
- opus: fix bogus granulepos - opus: fix bogus granulepos
* output
- fix failure to open device right after booting
* neighbor * neighbor
- nfs: fix deadlock when connecting - nfs: fix deadlock when connecting

3
src/output/OutputControl.cxx
View File

@ -184,7 +184,8 @@ AudioOutput::LockUpdate(const AudioFormat audio_format,
const ScopeLock protect(mutex); const ScopeLock protect(mutex);
if (enabled && really_enabled) { if (enabled && really_enabled) {
if (fail_timer.Check(REOPEN_AFTER * 1000)) { if (!fail_timer.IsDefined() ||
fail_timer.Check(REOPEN_AFTER * 1000)) {
return Open(audio_format, mp); return Open(audio_format, mp);
} }
} else if (IsOpen()) } else if (IsOpen())