From 579428172e5411a4530244ce5c7c78eb1f8bb41c Mon Sep 17 00:00:00 2001 From: Max Kellermann <max@musicpd.org> Date: Wed, 10 Mar 2021 17:38:28 +0100 Subject: [PATCH] output/wasapi: remove the broken Delay() calculation code This code is complicated - and broken: the producer thread is not allowed to call consumer methods. Also the code is not necessary because this plugin implements Interrupt(). --- src/output/plugins/wasapi/WasapiOutputPlugin.cxx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx index f08b2fad4..a3501c94d 100644 --- a/src/output/plugins/wasapi/WasapiOutputPlugin.cxx +++ b/src/output/plugins/wasapi/WasapiOutputPlugin.cxx @@ -601,15 +601,7 @@ WasapiOutput::Delay() const noexcept return std::chrono::seconds(1); } - assert(thread); - - const size_t data_size = thread->spsc_buffer.read_available(); - const size_t delay_size = std::max(data_size, watermark) - watermark; - - using s = std::chrono::seconds; - using duration = std::chrono::steady_clock::duration; - auto result = duration(s(delay_size)) / device_format.Format.nAvgBytesPerSec; - return result; + return std::chrono::steady_clock::duration::zero(); } size_t