From 04e2d084176b2571dc9ea37a1e4378ad833229b8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 20 Aug 2019 19:33:15 +0200 Subject: [PATCH] decoder/Control: inline WaitForDecoder() --- src/decoder/Control.cxx | 6 ------ src/decoder/Control.hxx | 4 +++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/decoder/Control.cxx b/src/decoder/Control.cxx index 7d80d181f..4d106015d 100644 --- a/src/decoder/Control.cxx +++ b/src/decoder/Control.cxx @@ -40,12 +40,6 @@ DecoderControl::~DecoderControl() noexcept ClearError(); } -void -DecoderControl::WaitForDecoder(std::unique_lock &lock) noexcept -{ - client_cond.wait(lock); -} - void DecoderControl::SetReady(const AudioFormat audio_format, bool _seekable, SignedSongTime _duration) noexcept diff --git a/src/decoder/Control.hxx b/src/decoder/Control.hxx index 363a77282..93d174d52 100644 --- a/src/decoder/Control.hxx +++ b/src/decoder/Control.hxx @@ -215,7 +215,9 @@ public: * * Caller must hold the lock. */ - void WaitForDecoder(std::unique_lock &lock) noexcept; + void WaitForDecoder(std::unique_lock &lock) noexcept { + client_cond.wait(lock); + } bool IsIdle() const noexcept { return state == DecoderState::STOP ||