diff options
| -rw-r--r-- | src/Main.cxx | 2 | ||||
| -rw-r--r-- | src/tag/Config.cxx | 6 | ||||
| -rw-r--r-- | src/tag/Config.hxx | 4 | ||||
| -rw-r--r-- | test/DumpDatabase.cxx | 2 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/Main.cxx b/src/Main.cxx index 9b92ad8d7..d3ade091c 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -500,7 +500,7 @@ try { glue_daemonize_init(&options); #endif - TagLoadConfig(); + TagLoadConfig(GetGlobalConfig()); log_init(options.verbose, options.log_stderr); diff --git a/src/tag/Config.cxx b/src/tag/Config.cxx index a08239efd..07232f3f3 100644 --- a/src/tag/Config.cxx +++ b/src/tag/Config.cxx @@ -21,7 +21,7 @@ #include "Config.hxx" #include "Settings.hxx" #include "ParseName.hxx" -#include "config/Global.hxx" +#include "config/Data.hxx" #include "config/Option.hxx" #include "util/Alloc.hxx" #include "util/ASCII.hxx" @@ -31,9 +31,9 @@ #include <stdlib.h> void -TagLoadConfig() +TagLoadConfig(const ConfigData &config) { - const char *value = config_get_string(ConfigOption::METADATA_TO_USE); + const char *value = config.GetString(ConfigOption::METADATA_TO_USE); if (value == nullptr) return; diff --git a/src/tag/Config.hxx b/src/tag/Config.hxx index 47d1eb835..afbf8e817 100644 --- a/src/tag/Config.hxx +++ b/src/tag/Config.hxx @@ -20,7 +20,9 @@ #ifndef MPD_TAG_CONFIG_HXX #define MPD_TAG_CONFIG_HXX +struct ConfigData; + void -TagLoadConfig(); +TagLoadConfig(const ConfigData &config); #endif diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index 8f4f99d10..9ecfa690c 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -126,7 +126,7 @@ try { ReadConfigFile(config_path); - TagLoadConfig(); + TagLoadConfig(GetGlobalConfig()); MyDatabaseListener database_listener; |