diff --git a/Makefile.am b/Makefile.am index 54c596511..69b8056f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1021,7 +1021,6 @@ libconf_a_SOURCES = \ src/config/Block.cxx src/config/Block.hxx \ src/config/Param.cxx src/config/Param.hxx \ src/config/Parser.cxx src/config/Parser.hxx \ - src/config/Global.cxx src/config/Global.hxx \ src/config/File.cxx src/config/File.hxx \ src/config/Migrate.cxx src/config/Migrate.hxx \ src/config/Templates.cxx src/config/Templates.hxx \ diff --git a/src/config/Global.cxx b/src/config/Global.cxx deleted file mode 100644 index affdc394b..000000000 --- a/src/config/Global.cxx +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2003-2017 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" -#include "Global.hxx" -#include "Migrate.hxx" -#include "Data.hxx" -#include "Block.hxx" -#include "File.hxx" -#include "Path.hxx" -#include "Domain.hxx" -#include "fs/Path.hxx" -#include "util/RuntimeError.hxx" -#include "Log.hxx" - -static ConfigData config_data; - -void config_global_finish(void) -{ - config_data.Clear(); -} - -void config_global_init(void) -{ -} - -const ConfigData & -GetGlobalConfig() noexcept -{ - return config_data; -} - -void -ReadConfigFile(Path path) -{ - ReadConfigFile(config_data, path); - Migrate(config_data); -} - -const char * -config_get_string(ConfigOption option, const char *default_value) noexcept -{ - return config_data.GetString(option, default_value); -} - -unsigned -config_get_positive(ConfigOption option, unsigned default_value) -{ - return config_data.GetPositive(option, default_value); -} - -bool -config_get_bool(ConfigOption option, bool default_value) -{ - return config_data.GetBool(option, default_value); -} diff --git a/src/config/Global.hxx b/src/config/Global.hxx deleted file mode 100644 index 7a0cfccde..000000000 --- a/src/config/Global.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2003-2017 The Music Player Daemon Project - * http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPD_CONFIG_GLOBAL_HXX -#define MPD_CONFIG_GLOBAL_HXX - -#include "Option.hxx" -#include "Compiler.h" - -class Path; -struct ConfigData; - -void -config_global_init(); - -void -config_global_finish(); - -gcc_const -const ConfigData & -GetGlobalConfig() noexcept; - -void -ReadConfigFile(Path path); - -const char * -config_get_string(enum ConfigOption option, - const char *default_value=nullptr) noexcept; - -unsigned -config_get_positive(enum ConfigOption option, unsigned default_value); - -bool config_get_bool(enum ConfigOption option, bool default_value); - -#endif