diff options
| author | Max Kellermann <max@musicpd.org> | 2018-07-17 21:49:27 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-07-17 22:05:27 +0200 |
| commit | 0ff0aca2e2391a42900a588f9b6ed4d525509aac (patch) | |
| tree | 0fd780e23fd5f246baeaec6d68f34979d2364de3 /test | |
| parent | 7b02c0224c839d88bb61ee719d780f6a653eb4e2 (diff) | |
input/Init: use struct ConfigData
Diffstat (limited to 'test')
| -rw-r--r-- | test/dump_playlist.cxx | 2 | ||||
| -rw-r--r-- | test/dump_text_file.cxx | 7 | ||||
| -rw-r--r-- | test/read_tags.cxx | 2 | ||||
| -rw-r--r-- | test/run_decoder.cxx | 3 | ||||
| -rw-r--r-- | test/run_input.cxx | 3 | ||||
| -rw-r--r-- | test/visit_archive.cxx | 7 |
6 files changed, 12 insertions, 12 deletions
diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 0a0aabda4..6ddced166 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -67,7 +67,7 @@ try { EventThread io_thread; io_thread.Start(); - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(GetGlobalConfig(), io_thread.GetEventLoop()); playlist_list_global_init(); decoder_plugin_init_all(GetGlobalConfig()); diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index 28638e8e0..3266b4923 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -22,7 +22,7 @@ #include "input/Init.hxx" #include "input/InputStream.hxx" #include "input/TextInputStream.hxx" -#include "config/Global.hxx" +#include "config/Data.hxx" #include "util/PrintException.hxx" #ifdef ENABLE_ARCHIVE @@ -41,11 +41,11 @@ class GlobalInit { public: GlobalInit() { io_thread.Start(); - config_global_init(); #ifdef ENABLE_ARCHIVE archive_plugin_init_all(); #endif - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(ConfigData(), + io_thread.GetEventLoop()); } ~GlobalInit() { @@ -53,7 +53,6 @@ public: #ifdef ENABLE_ARCHIVE archive_plugin_deinit_all(); #endif - config_global_finish(); } }; diff --git a/test/read_tags.cxx b/test/read_tags.cxx index b88cc204f..fa994a9de 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -93,7 +93,7 @@ try { EventThread io_thread; io_thread.Start(); - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(ConfigData(), io_thread.GetEventLoop()); AtScopeExit() { input_stream_global_finish(); }; decoder_plugin_init_all(ConfigData()); diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index e1a353b92..e7e395432 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -98,7 +98,8 @@ public: if (!config_path.IsNull()) ReadConfigFile(config_path); - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(GetGlobalConfig(), + io_thread.GetEventLoop()); decoder_plugin_init_all(GetGlobalConfig()); } diff --git a/test/run_input.cxx b/test/run_input.cxx index 991567f8f..a058a1d8d 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -116,7 +116,8 @@ public: #ifdef ENABLE_ARCHIVE archive_plugin_init_all(); #endif - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(GetGlobalConfig(), + io_thread.GetEventLoop()); } ~GlobalInit() { diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx index d6bf43ff5..9fd14cc0e 100644 --- a/test/visit_archive.cxx +++ b/test/visit_archive.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "tag/Tag.hxx" -#include "config/Global.hxx" +#include "config/Data.hxx" #include "event/Thread.hxx" #include "input/Init.hxx" #include "archive/ArchiveList.hxx" @@ -41,11 +41,11 @@ class GlobalInit { public: GlobalInit() { io_thread.Start(); - config_global_init(); #ifdef ENABLE_ARCHIVE archive_plugin_init_all(); #endif - input_stream_global_init(io_thread.GetEventLoop()); + input_stream_global_init(ConfigData(), + io_thread.GetEventLoop()); } ~GlobalInit() { @@ -53,7 +53,6 @@ public: #ifdef ENABLE_ARCHIVE archive_plugin_deinit_all(); #endif - config_global_finish(); } }; |