From 7467b85019914156c7a1e1f919cdb05186a373d7 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 8 Jun 2017 13:20:55 +0200
Subject: [PATCH] output/Thread: rename audio_format to in_audio_format

---
 src/output/Thread.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/output/Thread.cxx b/src/output/Thread.cxx
index 646d08384..554bf82cd 100644
--- a/src/output/Thread.cxx
+++ b/src/output/Thread.cxx
@@ -86,14 +86,14 @@ AudioOutput::CloseFilter() noexcept
 }
 
 inline void
-AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &pipe)
+AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe)
 {
-	assert(audio_format.IsValid());
+	assert(in_audio_format.IsValid());
 
 	AudioFormat f;
 
 	try {
-		f = source.Open(audio_format, pipe,
+		f = source.Open(in_audio_format, pipe,
 				prepared_replay_gain_filter,
 				prepared_other_replay_gain_filter,
 				prepared_filter);
@@ -139,9 +139,9 @@ AudioOutput::Open(const AudioFormat audio_format, const MusicPipe &pipe)
 		}
 	}
 
-	if (f != source.GetInputAudioFormat() || f != out_audio_format)
+	if (f != in_audio_format || f != out_audio_format)
 		FormatDebug(output_domain, "converting in=%s -> f=%s -> out=%s",
-			    ToString(source.GetInputAudioFormat()).c_str(),
+			    ToString(in_audio_format).c_str(),
 			    ToString(f).c_str(),
 			    ToString(out_audio_format).c_str());
 }