OutputControl: fix fail_timer check right after booting

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.

OutputControl: fix fail_timer check right after booting
ae77542a · Romain Rollet · Max Kellermann · 980187f8 · ae77542a · ae77542a
Commit ae77542a authored Jun 20, 2015 by Romain Rollet Committed by Max Kellermann Jun 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

NEWS NEWS +2 -0

OutputControl.cxx src/output/OutputControl.cxx +2 -1

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


--- a/src/output/OutputControl.cxx
+++ b/src/output/OutputControl.cxx
@@ -184,7 +184,8 @@ AudioOutput::LockUpdate(const AudioFormat audio_format,
 	const ScopeLock protect(mutex);

 	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);
 		}
 	} else if (IsOpen())