oysteikt/mpd
oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

output/Thread: rename audio_format to in_audio_format

Browse Source
This commit is contained in:
Max Kellermann 2017-06-08 13:20:55 +02:00
parent 7dea615f74
commit 7467b85019
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/output/Thread.cxx
View File

@ -86,14 +86,14 @@ AudioOutput::CloseFilter() noexcept
} }
inline void 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; AudioFormat f;
try { try {
f = source.Open(audio_format, pipe, f = source.Open(in_audio_format, pipe,
prepared_replay_gain_filter, prepared_replay_gain_filter,
prepared_other_replay_gain_filter, prepared_other_replay_gain_filter,
prepared_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", 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(f).c_str(),
ToString(out_audio_format).c_str()); ToString(out_audio_format).c_str());
} }