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

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

Browse Source 
That function is "noexcept".
This commit is contained in:
Max Kellermann
2017-06-08 21:49:41 +02:00
parent 0500990d23
commit 0494779ecb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/output/Thread.cxx
View File

@@ -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) {