Commit 0209bc4b authored by Max Kellermann's avatar Max Kellermann

ReplayGainGlobal: use struct ConfigData

parent dd57b819
......@@ -135,9 +135,9 @@ struct Config {
};
static Config
LoadConfig()
LoadConfig(const ConfigData &config)
{
return {LoadReplayGainConfig()};
return {LoadReplayGainConfig(config)};
}
#ifdef ENABLE_DAEMON
......@@ -494,7 +494,7 @@ try {
ParseCommandLine(argc, argv, options);
#endif
const auto config = LoadConfig();
const auto config = LoadConfig(GetGlobalConfig());
#ifdef ENABLE_DAEMON
glue_daemonize_init(&options);
......
......@@ -21,7 +21,7 @@
#include "ReplayGainGlobal.hxx"
#include "ReplayGainConfig.hxx"
#include "config/Param.hxx"
#include "config/Global.hxx"
#include "config/Data.hxx"
#include "util/RuntimeError.hxx"
#include <assert.h>
......@@ -56,19 +56,19 @@ ParsePreamp(const ConfigParam &p)
}
ReplayGainConfig
LoadReplayGainConfig()
LoadReplayGainConfig(const ConfigData &config)
{
ReplayGainConfig replay_gain_config;
const auto *param = config_get_param(ConfigOption::REPLAYGAIN_PREAMP);
const auto *param = config.GetParam(ConfigOption::REPLAYGAIN_PREAMP);
if (param)
replay_gain_config.preamp = ParsePreamp(*param);
param = config_get_param(ConfigOption::REPLAYGAIN_MISSING_PREAMP);
param = config.GetParam(ConfigOption::REPLAYGAIN_MISSING_PREAMP);
if (param)
replay_gain_config.missing_preamp = ParsePreamp(*param);
replay_gain_config.limit = config_get_bool(ConfigOption::REPLAYGAIN_LIMIT,
replay_gain_config.limit = config.GetBool(ConfigOption::REPLAYGAIN_LIMIT,
ReplayGainConfig::DEFAULT_LIMIT);
return replay_gain_config;
......
......@@ -22,9 +22,10 @@
#include "check.h"
struct ConfigData;
struct ReplayGainConfig;
ReplayGainConfig
LoadReplayGainConfig();
LoadReplayGainConfig(const ConfigData &config);
#endif
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