output/alsa: replace PeriodBuffer::IsEmpty() with IsCleared()

This assertion is not about whether all data has been consumed, but about whether there has been any data at all.

output/alsa: replace PeriodBuffer::IsEmpty() with IsCleared()
d66f5a85 · Max Kellermann · 30ca6b88 · d66f5a85 · d66f5a85
Commit d66f5a85 authored Jun 27, 2019 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

PeriodBuffer.hxx src/lib/alsa/PeriodBuffer.hxx +6 -2

AlsaOutputPlugin.cxx src/output/plugins/AlsaOutputPlugin.cxx +1 -1

No files found.
--- a/src/lib/alsa/PeriodBuffer.hxx
+++ b/src/lib/alsa/PeriodBuffer.hxx
@@ -65,8 +65,12 @@ public:
 		delete[] buffer;
 	}

-	bool IsEmpty() const noexcept {
-		return head == tail;
+	/**
+	 * Has there no data been appended since the last Clear()
+	 * call?
+	 */
+	bool IsCleared() const noexcept {
+		return tail == 0;
 	}

 	bool IsFull() const noexcept {

--- a/src/output/plugins/AlsaOutputPlugin.cxx
+++ b/src/output/plugins/AlsaOutputPlugin.cxx
@@ -857,7 +857,7 @@ AlsaOutput::Cancel() noexcept
 		   synchronization */

 		pcm_export->Reset();
-		assert(period_buffer.IsEmpty());
+		assert(period_buffer.IsCleared());
 		ring_buffer->reset();

 		return;