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_output.cxx | |
| parent | 848f6aa5ab4d15289248646b60f11b5cf508b46d (diff) | |
test/ConfigGlue: merge duplicate code from various debug programs
Diffstat (limited to 'test/run_output.cxx')
| -rw-r--r-- | test/run_output.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/test/run_output.cxx b/test/run_output.cxx index 4b45eed7a..c69e8f67b 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -20,12 +20,7 @@ #include "output/Interface.hxx" #include "output/Registry.hxx" #include "output/OutputPlugin.hxx" -#include "config/Param.hxx" -#include "config/Data.hxx" -#include "config/File.hxx" -#include "config/Migrate.hxx" -#include "config/Option.hxx" -#include "config/Block.hxx" +#include "ConfigGlue.hxx" #include "event/Thread.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" @@ -122,9 +117,7 @@ try { /* read configuration file (mpd.conf) */ - ConfigData config; - ReadConfigFile(config, config_path); - Migrate(config); + const auto config = AutoLoadConfigFile(config_path); EventThread io_thread; io_thread.Start(); |