output/Internal: move the AudioOutputSource to struct AudioOutputControl

1 files changed, 9 insertions, 11 deletions

diff --git a/src/output/Control.cxx b/src/output/Control.cxx
index bcc38f5be..557b7946b 100644
--- a/src/output/Control.cxx
+++ b/src/output/Control.cxx
@@ -245,15 +245,19 @@ AudioOutputControl::LockUpdate(const AudioFormat audio_format,
 }
 
 bool
-AudioOutputControl::LockIsChunkConsumed(const MusicChunk &chunk) const noexcept
+AudioOutputControl::IsChunkConsumed(const MusicChunk &chunk) const noexcept
 {
-	return output->LockIsChunkConsumed(chunk);
+	if (!output->open)
+		return true;
+
+	return source.IsChunkConsumed(chunk);
 }
 
-void
-AudioOutputControl::ClearTailChunk(const MusicChunk &chunk) noexcept
+bool
+AudioOutputControl::LockIsChunkConsumed(const MusicChunk &chunk) const noexcept
 {
-	output->ClearTailChunk(chunk);
+	const std::lock_guard<Mutex> protect(mutex);
+	return IsChunkConsumed(chunk);
 }
 
 void
@@ -335,12 +339,6 @@ AudioOutputControl::LockCloseWait() noexcept
 }
 
 void
-AudioOutputControl::SetReplayGainMode(ReplayGainMode _mode) noexcept
-{
-	return output->SetReplayGainMode(_mode);
-}
-
-void
 AudioOutputControl::StopThread() noexcept
 {
 	assert(thread.IsDefined());