output/Init: pass global configuration in struct AudioOutputDefaults
This commit is contained in:
@@ -20,6 +20,7 @@
|
||||
#include "config.h"
|
||||
#include "MultipleOutputs.hxx"
|
||||
#include "Filtered.hxx"
|
||||
#include "Defaults.hxx"
|
||||
#include "Domain.hxx"
|
||||
#include "MusicPipe.hxx"
|
||||
#include "MusicChunk.hxx"
|
||||
@@ -53,9 +54,11 @@ LoadOutput(EventLoop &event_loop,
|
||||
const ReplayGainConfig &replay_gain_config,
|
||||
MixerListener &mixer_listener,
|
||||
const ConfigBlock &block,
|
||||
const AudioOutputDefaults &defaults,
|
||||
FilterFactory *filter_factory)
|
||||
try {
|
||||
return audio_output_new(event_loop, replay_gain_config, block,
|
||||
defaults,
|
||||
filter_factory,
|
||||
mixer_listener);
|
||||
} catch (...) {
|
||||
@@ -71,11 +74,12 @@ LoadOutputControl(EventLoop &event_loop,
|
||||
const ReplayGainConfig &replay_gain_config,
|
||||
MixerListener &mixer_listener,
|
||||
AudioOutputClient &client, const ConfigBlock &block,
|
||||
const AudioOutputDefaults &defaults,
|
||||
FilterFactory *filter_factory)
|
||||
{
|
||||
auto output = LoadOutput(event_loop, replay_gain_config,
|
||||
mixer_listener,
|
||||
block, filter_factory);
|
||||
block, defaults, filter_factory);
|
||||
auto *control = new AudioOutputControl(std::move(output), client);
|
||||
|
||||
try {
|
||||
@@ -95,6 +99,7 @@ MultipleOutputs::Configure(EventLoop &event_loop,
|
||||
const ReplayGainConfig &replay_gain_config,
|
||||
AudioOutputClient &client)
|
||||
{
|
||||
const AudioOutputDefaults defaults(config);
|
||||
FilterFactory filter_factory(config);
|
||||
|
||||
for (const auto &block : config.GetBlockList(ConfigBlockOption::AUDIO_OUTPUT)) {
|
||||
@@ -102,7 +107,8 @@ MultipleOutputs::Configure(EventLoop &event_loop,
|
||||
auto *output = LoadOutputControl(event_loop,
|
||||
replay_gain_config,
|
||||
mixer_listener,
|
||||
client, block, &filter_factory);
|
||||
client, block, defaults,
|
||||
&filter_factory);
|
||||
if (FindByName(output->GetName()) != nullptr)
|
||||
throw FormatRuntimeError("output devices with identical "
|
||||
"names: %s", output->GetName());
|
||||
@@ -116,7 +122,7 @@ MultipleOutputs::Configure(EventLoop &event_loop,
|
||||
auto *output = LoadOutputControl(event_loop,
|
||||
replay_gain_config,
|
||||
mixer_listener,
|
||||
client, empty,
|
||||
client, empty, defaults,
|
||||
nullptr);
|
||||
outputs.push_back(output);
|
||||
}
|
||||
@@ -127,12 +133,14 @@ MultipleOutputs::AddNullOutput(EventLoop &event_loop,
|
||||
const ReplayGainConfig &replay_gain_config,
|
||||
AudioOutputClient &client)
|
||||
{
|
||||
const AudioOutputDefaults defaults;
|
||||
|
||||
ConfigBlock block;
|
||||
block.AddBlockParam("type", "null");
|
||||
|
||||
auto *output = LoadOutputControl(event_loop, replay_gain_config,
|
||||
mixer_listener,
|
||||
client, block, nullptr);
|
||||
client, block, defaults, nullptr);
|
||||
outputs.push_back(output);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user