diff options
| author | Max Kellermann <max@musicpd.org> | 2019-02-05 21:56:20 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-02-05 21:56:20 +0100 |
| commit | b0739eca87439a8f9cc2a0f9a6fcba1f68708df6 (patch) | |
| tree | 7b53421e6025811fac47abf751a78395d26c648e /test/run_input.cxx | |
| parent | 848f6aa5ab4d15289248646b60f11b5cf508b46d (diff) | |
test/ConfigGlue: merge duplicate code from various debug programs
Diffstat (limited to 'test/run_input.cxx')
| -rw-r--r-- | test/run_input.cxx | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/test/run_input.cxx b/test/run_input.cxx index c58316ba5..f81a8bc77 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -1,5 +1,5 @@ /* - * Copyright 2003-2018 The Music Player Daemon Project + * Copyright 2003-2019 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -20,9 +20,7 @@ #include "config.h" #include "TagSave.hxx" #include "tag/Tag.hxx" -#include "config/File.hxx" -#include "config/Migrate.hxx" -#include "config/Data.hxx" +#include "ConfigGlue.hxx" #include "input/InputStream.hxx" #include "input/Init.hxx" #include "input/Registry.hxx" @@ -103,7 +101,7 @@ ParseCommandLine(int argc, char **argv) } class GlobalInit { - ConfigData config; + const ConfigData config; EventThread io_thread; #ifdef ENABLE_ARCHIVE @@ -111,14 +109,9 @@ class GlobalInit { #endif public: - GlobalInit(Path config_path, bool verbose) { - SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO); - - if (!config_path.IsNull()) { - ReadConfigFile(config, config_path); - Migrate(config); - } - + explicit GlobalInit(Path config_path) + :config(AutoLoadConfigFile(config_path)) + { io_thread.Start(); input_stream_global_init(config, @@ -234,7 +227,8 @@ try { /* initialize MPD */ - const GlobalInit init(c.config_path, c.verbose); + SetLogThreshold(c.verbose ? LogLevel::DEBUG : LogLevel::INFO); + const GlobalInit init(c.config_path); if (c.scan) return Scan(c.uri); |