diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/ConfigDefaults.hxx | 26 | ||||
| -rw-r--r-- | src/ConfigGlobal.hxx | 4 | ||||
| -rw-r--r-- | src/Main.cxx | 1 | ||||
| -rw-r--r-- | src/PlaylistFile.cxx | 1 | ||||
| -rw-r--r-- | src/conf.h | 5 |
6 files changed, 29 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 39f98ef16..6ea3012ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -411,6 +411,7 @@ endif # configuration library libconf_a_SOURCES = \ + src/ConfigDefaults.hxx \ src/ConfigPath.cxx src/ConfigPath.hxx \ src/ConfigData.cxx src/ConfigData.hxx \ src/ConfigParser.cxx src/ConfigParser.hxx \ diff --git a/src/ConfigDefaults.hxx b/src/ConfigDefaults.hxx new file mode 100644 index 000000000..9cfe61582 --- /dev/null +++ b/src/ConfigDefaults.hxx @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2003-2013 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_DEFAULTS_HXX +#define MPD_CONFIG_DEFAULTS_HXX + +static constexpr unsigned DEFAULT_PLAYLIST_MAX_LENGTH = 16 * 1024; +static constexpr bool DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS = false; + +#endif diff --git a/src/ConfigGlobal.hxx b/src/ConfigGlobal.hxx index efa5e0604..b4aa5fd85 100644 --- a/src/ConfigGlobal.hxx +++ b/src/ConfigGlobal.hxx @@ -23,12 +23,8 @@ #include "ConfigOption.hxx" #include "gcc.h" -#include <stdbool.h> #include <stddef.h> -#define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16) -#define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS false - class Error; class Path; diff --git a/src/Main.cxx b/src/Main.cxx index df06fd45a..63008d87a 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -57,6 +57,7 @@ #include "Daemon.hxx" #include "system/FatalError.hxx" #include "util/Error.hxx" +#include "ConfigDefaults.hxx" extern "C" { #include "stats.h" diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index c05558fe3..c0413687f 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -28,6 +28,7 @@ #include "Mapper.hxx" #include "TextFile.hxx" #include "conf.h" +#include "ConfigDefaults.hxx" #include "Idle.hxx" #include "fs/Path.hxx" #include "fs/FileSystem.hxx" diff --git a/src/conf.h b/src/conf.h index 8eb185fa7..df01e466a 100644 --- a/src/conf.h +++ b/src/conf.h @@ -25,9 +25,4 @@ #include "ConfigData.hxx" #include "gcc.h" -#define DEFAULT_PLAYLIST_MAX_LENGTH (1024*16) -#define DEFAULT_PLAYLIST_SAVE_ABSOLUTE_PATHS false - -#define MAX_FILTER_CHAIN_LENGTH 255 - #endif |