Main: add Config constructor

7d599c1a · Max Kellermann · 7c565bce · 7d599c1a
Commit 7d599c1a authored May 29, 2019 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

Main.cxx src/Main.cxx +4 -7

No files found.
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -133,13 +133,10 @@ Instance *global_instance;
 struct Config {
 	ReplayGainConfig replay_gain;
-};
-static Config
+	explicit Config(const ConfigData &raw)
-LoadConfig(const ConfigData &config)
+		:replay_gain(LoadReplayGainConfig(raw)) {}
-{
+};
-	return {LoadReplayGainConfig(config)};
-}
 #ifdef ENABLE_DAEMON
@@ -391,7 +388,7 @@ MainConfigured(const struct options &options, const ConfigData &raw_config)
 #endif
 	InitPathParser(raw_config);
-	const auto config = LoadConfig(raw_config);
+	const Config config(raw_config);
 #ifdef ENABLE_DAEMON
 	glue_daemonize_init(&options, raw_config);