conf.h: move constants to ConfigDefaults.hxx

This commit is contained in:
Max Kellermann 2013-09-05 08:42:08 +02:00
parent 7d0269d2ce
commit 9605e24655
6 changed files with 29 additions and 9 deletions

View File

@ -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 \

26
src/ConfigDefaults.hxx Normal file
View File

@ -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

View File

@ -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;

View File

@ -57,6 +57,7 @@
#include "Daemon.hxx"
#include "system/FatalError.hxx"
#include "util/Error.hxx"
#include "ConfigDefaults.hxx"
extern "C" {
#include "stats.h"

View File

@ -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"

View File

@ -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