From 8a432c9b7f9808ccd168d8e33be3f828ec316cec Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Sat, 3 Aug 2019 11:19:19 +0200
Subject: decoder/mad: move code to LoadNextFrame()

---
 src/decoder/plugins/MadDecoderPlugin.cxx | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx
index 7cc57b245..a73716cb1 100644
--- a/src/decoder/plugins/MadDecoderPlugin.cxx
+++ b/src/decoder/plugins/MadDecoderPlugin.cxx
@@ -207,6 +207,8 @@ private:
 	 */
 	bool HandleCurrentFrame() noexcept;
 
+	bool LoadNextFrame() noexcept;
+
 	bool Read() noexcept;
 };
 
@@ -965,11 +967,8 @@ MadDecoder::HandleCurrentFrame() noexcept
 }
 
 inline bool
-MadDecoder::Read() noexcept
+MadDecoder::LoadNextFrame() noexcept
 {
-	if (!HandleCurrentFrame())
-		return false;
-
 	while (true) {
 		MadDecoderAction ret;
 		do {
@@ -999,6 +998,13 @@ MadDecoder::Read() noexcept
 	}
 }
 
+inline bool
+MadDecoder::Read() noexcept
+{
+	return HandleCurrentFrame() &&
+		LoadNextFrame();
+}
+
 inline void
 MadDecoder::RunDecoder() noexcept
 {
-- 
cgit v1.2.3