input/Init: use struct ConfigData

9 files changed, 20 insertions, 18 deletions

diff --git a/src/Main.cxx b/src/Main.cxx
index c13e84dda..062009adc 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -570,7 +570,8 @@ try {
 	}
 
 	client_manager_init();
-	input_stream_global_init(instance->io_thread.GetEventLoop());
+	input_stream_global_init(GetGlobalConfig(),
+				 instance->io_thread.GetEventLoop());
 	playlist_list_global_init();
 
 #ifdef ENABLE_DAEMON
diff --git a/src/input/Init.cxx b/src/input/Init.cxx
index 12433175b..c9c4d5883 100644
--- a/src/input/Init.cxx
+++ b/src/input/Init.cxx
@@ -21,7 +21,7 @@
 #include "Init.hxx"
 #include "Registry.hxx"
 #include "InputPlugin.hxx"
-#include "config/Global.hxx"
+#include "config/Data.hxx"
 #include "config/Option.hxx"
 #include "config/Block.hxx"
 #include "Log.hxx"
@@ -33,7 +33,7 @@
 #include <assert.h>
 
 void
-input_stream_global_init(EventLoop &event_loop)
+input_stream_global_init(const ConfigData &config, EventLoop &event_loop)
 {
 	const ConfigBlock empty;
 
@@ -45,8 +45,8 @@ input_stream_global_init(EventLoop &event_loop)
 		assert(plugin->open != nullptr);
 
 		const auto *block =
-			config_find_block(ConfigBlockOption::INPUT, "plugin",
-					  plugin->name);
+			config.FindBlock(ConfigBlockOption::INPUT, "plugin",
+					 plugin->name);
 		if (block == nullptr) {
 			block = &empty;
 		} else if (!block->GetBlockValue("enabled", true))
diff --git a/src/input/Init.hxx b/src/input/Init.hxx
index 0b73f8b0b..251344b40 100644
--- a/src/input/Init.hxx
+++ b/src/input/Init.hxx
@@ -20,13 +20,14 @@
 #ifndef MPD_INPUT_INIT_HXX
 #define MPD_INPUT_INIT_HXX
 
+struct ConfigData;
 class EventLoop;
 
 /**
  * Initializes this library and all #InputStream implementations.
  */
 void
-input_stream_global_init(EventLoop &event_loop);
+input_stream_global_init(const ConfigData &config, EventLoop &event_loop);
 
 /**
  * Deinitializes this library and all #InputStream implementations.
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();
 	}
 };