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

filter/convert: add method IsActive()

Browse Source
This commit is contained in:
Max Kellermann 2018-02-09 19:04:45 +01:00
parent 6de92bb42b
commit 56b74ad990
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/filter/plugins/ConvertFilterPlugin.cxx
View File

@ -57,6 +57,11 @@ public:
} }
ConstBuffer<void> FilterPCM(ConstBuffer<void> src) override; ConstBuffer<void> FilterPCM(ConstBuffer<void> src) override;
private:
bool IsActive() const noexcept {
return out_audio_format != in_audio_format;
}
}; };
class PreparedConvertFilter final : public PreparedFilter { class PreparedConvertFilter final : public PreparedFilter {
@ -80,7 +85,7 @@ ConvertFilter::Set(const AudioFormat &_out_audio_format)
/* no change */ /* no change */
return; return;
if (out_audio_format != in_audio_format) { if (IsActive()) {
out_audio_format = in_audio_format; out_audio_format = in_audio_format;
state.Close(); state.Close();
} }
@ -111,7 +116,7 @@ ConvertFilter::~ConvertFilter()
{ {
assert(in_audio_format.IsValid()); assert(in_audio_format.IsValid());
if (out_audio_format != in_audio_format) if (IsActive())
state.Close(); state.Close();
} }
@ -120,11 +125,10 @@ ConvertFilter::FilterPCM(ConstBuffer<void> src)
{ {
assert(in_audio_format.IsValid()); assert(in_audio_format.IsValid());
if (out_audio_format == in_audio_format) return IsActive()
? state.Convert(src)
/* optimized special case: no-op */ /* optimized special case: no-op */
return src; : src;
return state.Convert(src);
} }
const FilterPlugin convert_filter_plugin = { const FilterPlugin convert_filter_plugin = {