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

filter/LoadChain: move code to class FilterFactory

Browse Source 
Eliminate a use of GetGlobalConfig().
This commit is contained in:
Max Kellermann
2018-08-18 20:57:02 +02:00
parent 1ba35e1fd4
commit 4531e4cc55
8 changed files with 120 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/output/MultipleOutputs.cxx
View File

@@ -23,6 +23,7 @@
#include "Domain.hxx"
#include "MusicPipe.hxx"
#include "MusicChunk.hxx"
#include "filter/Factory.hxx"
#include "config/Block.hxx"
#include "config/Data.hxx"
#include "config/Option.hxx"
@@ -51,9 +52,11 @@ static std::unique_ptr<FilteredAudioOutput>
LoadOutput(EventLoop &event_loop,
const ReplayGainConfig &replay_gain_config,
MixerListener &mixer_listener,
const ConfigBlock &block)
const ConfigBlock &block,
FilterFactory *filter_factory)
try {
return audio_output_new(event_loop, replay_gain_config, block,
filter_factory,
mixer_listener);
} catch (...) {
if (block.line > 0)
@@ -67,11 +70,12 @@ static AudioOutputControl *
LoadOutputControl(EventLoop &event_loop,
const ReplayGainConfig &replay_gain_config,
MixerListener &mixer_listener,
AudioOutputClient &client, const ConfigBlock &block)
AudioOutputClient &client, const ConfigBlock &block,
FilterFactory *filter_factory)
{
auto output = LoadOutput(event_loop, replay_gain_config,
mixer_listener,
block);
block, filter_factory);
auto *control = new AudioOutputControl(std::move(output), client);
try {
@@ -91,12 +95,14 @@ MultipleOutputs::Configure(EventLoop &event_loop,
const ReplayGainConfig &replay_gain_config,
AudioOutputClient &client)
{
FilterFactory filter_factory(config);
for (const auto &block : config.GetBlockList(ConfigBlockOption::AUDIO_OUTPUT)) {
block.SetUsed();
auto *output = LoadOutputControl(event_loop,
replay_gain_config,
mixer_listener,
client, block);
client, block, &filter_factory);
if (FindByName(output->GetName()) != nullptr)
throw FormatRuntimeError("output devices with identical "
"names: %s", output->GetName());
@@ -110,7 +116,8 @@ MultipleOutputs::Configure(EventLoop &event_loop,
auto *output = LoadOutputControl(event_loop,
replay_gain_config,
mixer_listener,
client, empty);
client, empty,
nullptr);
outputs.push_back(output);
}
}
@@ -125,7 +132,7 @@ MultipleOutputs::AddNullOutput(EventLoop &event_loop,
auto *output = LoadOutputControl(event_loop, replay_gain_config,
mixer_listener,
client, block);
client, block, nullptr);
outputs.push_back(output);
}