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

output/MultipleOutputs: use struct ConfigData

Browse Source
This commit is contained in:
Max Kellermann 2018-07-17 23:13:35 +02:00
parent 4f678aa244
commit 0c8ffa1ac3
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Main.cxx
View File

@ -572,6 +572,7 @@ try {
for (auto &partition : instance->partitions) { for (auto &partition : instance->partitions) {
partition.outputs.Configure(instance->rtio_thread.GetEventLoop(), partition.outputs.Configure(instance->rtio_thread.GetEventLoop(),
raw_config,
config.replay_gain, config.replay_gain,
partition.pc); partition.pc);
partition.UpdateEffectiveReplayGainMode(); partition.UpdateEffectiveReplayGainMode();

5
src/output/MultipleOutputs.cxx
View File

@ -24,7 +24,7 @@
#include "MusicPipe.hxx" #include "MusicPipe.hxx"
#include "MusicChunk.hxx" #include "MusicChunk.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "config/Global.hxx" #include "config/Data.hxx"
#include "config/Option.hxx" #include "config/Option.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
@ -87,10 +87,11 @@ LoadOutputControl(EventLoop &event_loop,
void void
MultipleOutputs::Configure(EventLoop &event_loop, MultipleOutputs::Configure(EventLoop &event_loop,
const ConfigData &config,
const ReplayGainConfig &replay_gain_config, const ReplayGainConfig &replay_gain_config,
AudioOutputClient &client) AudioOutputClient &client)
{ {
for (const auto *param = config_get_block(ConfigBlockOption::AUDIO_OUTPUT); for (const auto *param = config.GetBlock(ConfigBlockOption::AUDIO_OUTPUT);
param != nullptr; param = param->next) { param != nullptr; param = param->next) {
param->SetUsed(); param->SetUsed();
auto *output = LoadOutputControl(event_loop, auto *output = LoadOutputControl(event_loop,

2
src/output/MultipleOutputs.hxx
View File

@ -42,6 +42,7 @@ class MusicPipe;
class EventLoop; class EventLoop;
class MixerListener; class MixerListener;
class AudioOutputClient; class AudioOutputClient;
struct ConfigData;
struct ReplayGainConfig; struct ReplayGainConfig;
class MultipleOutputs final : public PlayerOutputs { class MultipleOutputs final : public PlayerOutputs {
@ -72,6 +73,7 @@ public:
~MultipleOutputs() noexcept; ~MultipleOutputs() noexcept;
void Configure(EventLoop &event_loop, void Configure(EventLoop &event_loop,
const ConfigData &config,
const ReplayGainConfig &replay_gain_config, const ReplayGainConfig &replay_gain_config,
AudioOutputClient &client); AudioOutputClient &client);