oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

tag/Config: use struct ConfigData

This commit is contained in:
Max Kellermann 2018-07-17 22:34:11 +02:00
parent 0209bc4ba7
commit 24a86dce21
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Main.cxx
View File

@ -500,7 +500,7 @@ try {
glue_daemonize_init(&options); glue_daemonize_init(&options);
#endif #endif
TagLoadConfig(); TagLoadConfig(GetGlobalConfig());
log_init(options.verbose, options.log_stderr); log_init(options.verbose, options.log_stderr);

6
src/tag/Config.cxx
View File

@ -21,7 +21,7 @@
#include "Config.hxx" #include "Config.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "ParseName.hxx" #include "ParseName.hxx"
#include "config/Global.hxx" #include "config/Data.hxx"
#include "config/Option.hxx" #include "config/Option.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
@ -31,9 +31,9 @@
#include <stdlib.h> #include <stdlib.h>
void 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) if (value == nullptr)
return; return;

4
src/tag/Config.hxx
View File

@ -20,7 +20,9 @@
#ifndef MPD_TAG_CONFIG_HXX #ifndef MPD_TAG_CONFIG_HXX
#define MPD_TAG_CONFIG_HXX #define MPD_TAG_CONFIG_HXX
struct ConfigData;
void void
TagLoadConfig(); TagLoadConfig(const ConfigData &config);
#endif #endif

2
test/DumpDatabase.cxx
View File

@ -126,7 +126,7 @@ try {
ReadConfigFile(config_path); ReadConfigFile(config_path);
TagLoadConfig(); TagLoadConfig(GetGlobalConfig());
MyDatabaseListener database_listener; MyDatabaseListener database_listener;