Skip to content

M
mpd
Commit 0494779e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/Thread: move software_mixer_set_filter() out of the "try" block

That function is "noexcept".
parent 0500990d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/output/Thread.cxx
View file @ 0494779e
...@@ -97,14 +97,14 @@ AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe) ...@@ -97,14 +97,14 @@ AudioOutput::Open(const AudioFormat in_audio_format, const MusicPipe &pipe)
prepared_replay_gain_filter, prepared_replay_gain_filter,
prepared_other_replay_gain_filter, prepared_other_replay_gain_filter,
prepared_filter); prepared_filter);
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, volume_filter.Get());
} catch (const std::runtime_error &e) { } catch (const std::runtime_error &e) {
std::throw_with_nested(FormatRuntimeError("Failed to open filter for \"%s\" [%s]", std::throw_with_nested(FormatRuntimeError("Failed to open filter for \"%s\" [%s]",
name, plugin.name)); name, plugin.name));
} }
if (mixer != nullptr && mixer->IsPlugin(software_mixer_plugin))
software_mixer_set_filter(*mixer, volume_filter.Get());
const auto cf = f.WithMask(config_audio_format); const auto cf = f.WithMask(config_audio_format);
if (open && cf != filter_audio_format) { if (open && cf != filter_audio_format) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment