From 187204f03c319d68e7d883d644f96c353ff801e7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 3 Aug 2019 08:51:15 +0200 Subject: [PATCH] decoder/mad: move code to HandleCurrentFrame() --- src/decoder/plugins/MadDecoderPlugin.cxx | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index aa8772859..7cc57b245 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -202,6 +202,11 @@ private: */ DecoderCommand SyncAndSend() noexcept; + /** + * @return false to stop decoding + */ + bool HandleCurrentFrame() noexcept; + bool Read() noexcept; }; @@ -919,7 +924,7 @@ MadDecoder::SyncAndSend() noexcept } inline bool -MadDecoder::Read() noexcept +MadDecoder::HandleCurrentFrame() noexcept { switch (mute_frame) { DecoderCommand cmd; @@ -956,6 +961,15 @@ MadDecoder::Read() noexcept return false; } + return true; +} + +inline bool +MadDecoder::Read() noexcept +{ + if (!HandleCurrentFrame()) + return false; + while (true) { MadDecoderAction ret; do {