Skip to content

M
mpd
Commit dafa3f98 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

test/run_decoder: allocate ConfigData in class GlobalInit

parent f865e139
Show whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
test/run_decoder.cxx
View file @ dafa3f98
...@@ -18,7 +18,9 @@ ...@@ -18,7 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "config/Global.hxx" #include "config/File.hxx"
#include "config/Migrate.hxx"
#include "config/Data.hxx"
#include "event/Thread.hxx" #include "event/Thread.hxx"
#include "decoder/DecoderList.hxx" #include "decoder/DecoderList.hxx"
#include "decoder/DecoderPlugin.hxx" #include "decoder/DecoderPlugin.hxx"
...@@ -87,20 +89,23 @@ ParseCommandLine(int argc, char **argv) ...@@ -87,20 +89,23 @@ ParseCommandLine(int argc, char **argv)
} }
class GlobalInit { class GlobalInit {
ConfigData config;
EventThread io_thread; EventThread io_thread;
public: public:
GlobalInit(Path config_path, bool verbose) { GlobalInit(Path config_path, bool verbose) {
SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO); SetLogThreshold(verbose ? LogLevel::DEBUG : LogLevel::INFO);
io_thread.Start(); if (!config_path.IsNull()) {
ReadConfigFile(config, config_path);
Migrate(config);
}
if (!config_path.IsNull()) io_thread.Start();
ReadConfigFile(config_path);
input_stream_global_init(GetGlobalConfig(), input_stream_global_init(config,
io_thread.GetEventLoop()); io_thread.GetEventLoop());
decoder_plugin_init_all(GetGlobalConfig()); decoder_plugin_init_all(config);
} }
~GlobalInit() { ~GlobalInit() {
......
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