aboutsummaryrefslogtreecommitdiffstats
path: root/src/filter/AutoConvertFilterPlugin.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-11-11 16:15:38 +0100
committerMax Kellermann <max@duempel.org>2013-11-13 21:06:33 +0100
commitd2679f59c5a6c8df7a2140d40ab65a17b8e5c023 (patch)
tree803edccbb6c7d383199eba5f91a8610ee3c63c96 /src/filter/AutoConvertFilterPlugin.cxx
parent4ee147ea34057c0bcef31afed55f98b025b997dc (diff)
downloadmpd-d2679f59c5a6c8df7a2140d40ab65a17b8e5c023.tar.gz
mpd-d2679f59c5a6c8df7a2140d40ab65a17b8e5c023.tar.xz
mpd-d2679f59c5a6c8df7a2140d40ab65a17b8e5c023.zip
PcmConvert: add methods Open(), Close()
Replaces Reset() and eliminates the AudioFormat parameters from the Convert() method.
Diffstat (limited to 'src/filter/AutoConvertFilterPlugin.cxx')
-rw-r--r--src/filter/AutoConvertFilterPlugin.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/filter/AutoConvertFilterPlugin.cxx b/src/filter/AutoConvertFilterPlugin.cxx
index 918a16e53..44adc8a66 100644
--- a/src/filter/AutoConvertFilterPlugin.cxx
+++ b/src/filter/AutoConvertFilterPlugin.cxx
@@ -88,7 +88,11 @@ AutoConvertFilter::Open(AudioFormat &in_audio_format, Error &error)
assert(audio_format2 == in_audio_format);
- convert_filter_set(convert, child_audio_format);
+ if (!convert_filter_set(convert, child_audio_format, error)) {
+ delete convert;
+ filter->Close();
+ return AudioFormat::Undefined();
+ }
} else
/* no */
convert = nullptr;