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

output/Internal: move code to ConfigureConvertFilter()

Browse Source
This commit is contained in:
Max Kellermann
2017-08-07 18:39:12 +02:00
parent d4ee165253
commit fc04620519
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/output/Thread.cxx
View File

@@ -24,7 +24,6 @@
#include "OutputPlugin.hxx"
#include "Domain.hxx"
#include "notify.hxx"
#include "filter/plugins/ConvertFilterPlugin.hxx"
#include "mixer/MixerInternal.hxx"
#include "thread/Util.hxx"
#include "thread/Slack.hxx"
@@ -73,8 +72,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
input AudioFormat */
try {
convert_filter_set(output->convert_filter.Get(),
output->out_audio_format);
output->ConfigureConvertFilter();
} catch (const std::runtime_error &e) {
open = false;
@@ -83,8 +81,7 @@ AudioOutputControl::InternalOpen2(const AudioFormat in_audio_format)
output->CloseOutput(false);
}
std::throw_with_nested(FormatRuntimeError("Failed to convert for \"%s\" [%s]",
GetName(), output->plugin.name));
throw;
}
}