input/Init: use struct ConfigData

This commit is contained in:
Max Kellermann
2018-07-17 21:49:27 +02:00
parent 7b02c0224c
commit 0ff0aca2e2
9 changed files with 20 additions and 18 deletions
+1 -1
View File
@@ -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());
+3 -4
View File
@@ -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();
}
};
+1 -1
View File
@@ -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());
+2 -1
View File
@@ -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());
}
+2 -1
View File
@@ -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() {
+3 -4
View File
@@ -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();
}
};