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

ConfigData: move struct config_param to Param.hxx

Browse Source
This commit is contained in:
Max Kellermann 2015-01-21 21:14:25 +01:00
parent 76b7882f33
commit fe85fa3bea
40 changed files with 144 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -769,8 +769,9 @@ endif
libconf_a_SOURCES = \
src/config/ConfigDefaults.hxx \
src/config/ConfigPath.cxx src/config/ConfigPath.hxx \
src/config/ConfigData.cxx src/config/ConfigData.hxx \
src/config/ConfigData.hxx \
src/config/Block.cxx src/config/Block.hxx \
src/config/Param.cxx src/config/Param.hxx \
src/config/ConfigParser.cxx src/config/ConfigParser.hxx \
src/config/ConfigGlobal.cxx src/config/ConfigGlobal.hxx \
src/config/ConfigFile.cxx src/config/ConfigFile.hxx \

2
src/AudioConfig.cxx
View File

@ -21,7 +21,7 @@
#include "AudioConfig.hxx"
#include "AudioFormat.hxx"
#include "AudioParser.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "util/Error.hxx"

2
src/Listen.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "Listen.hxx"
#include "client/Client.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "event/ServerSocket.hxx"

2
src/LogInit.cxx
View File

@ -21,7 +21,7 @@
#include "LogInit.hxx"
#include "LogBackend.hxx"
#include "Log.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "system/FatalError.hxx"

2
src/Main.cxx
View File

@ -58,7 +58,7 @@
#include "thread/Slack.hxx"
#include "lib/icu/Init.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigDefaults.hxx"
#include "config/ConfigOption.hxx"
#include "config/ConfigError.hxx"

2
src/Permission.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "Permission.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "system/FatalError.hxx"

2
src/ReplayGainConfig.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "ReplayGainConfig.hxx"
#include "Idle.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "system/FatalError.hxx"

79
src/config/ConfigData.hxx
View File

@ -20,88 +20,11 @@
#ifndef MPD_CONFIG_DATA_HXX
#define MPD_CONFIG_DATA_HXX
#include "Block.hxx"
#include "ConfigOption.hxx"
#include "Compiler.h"
#include <string>
#include <array>
#include <vector>
class AllocatedPath;
class Error;
struct config_param {
/**
* The next config_param with the same name. The destructor
* deletes the whole chain.
*/
struct config_param *next;
std::string value;
unsigned int line;
std::vector<BlockParam> block_params;
/**
* This flag is false when nobody has queried the value of
* this option yet.
*/
bool used;
config_param(int _line=-1)
:next(nullptr), line(_line), used(false) {}
gcc_nonnull_all
config_param(const char *_value, int _line=-1);
config_param(const config_param &) = delete;
~config_param();
config_param &operator=(const config_param &) = delete;
/**
* Determine if this is a "null" instance, i.e. an empty
* object that was synthesized and not loaded from a
* configuration file.
*/
bool IsNull() const {
return line == unsigned(-1);
}
gcc_nonnull_all
void AddBlockParam(const char *_name, const char *_value,
int _line=-1) {
block_params.emplace_back(_name, _value, _line);
}
gcc_nonnull_all gcc_pure
const BlockParam *GetBlockParam(const char *_name) const;
gcc_pure
const char *GetBlockValue(const char *name,
const char *default_value=nullptr) const;
/**
* Same as config_get_path(), but looks up the setting in the
* specified block.
*/
AllocatedPath GetBlockPath(const char *name, const char *default_value,
Error &error) const;
AllocatedPath GetBlockPath(const char *name, Error &error) const;
gcc_pure
int GetBlockValue(const char *name, int default_value) const;
gcc_pure
unsigned GetBlockValue(const char *name, unsigned default_value) const;
gcc_pure
bool GetBlockValue(const char *name, bool default_value) const;
};
struct config_param;
struct ConfigData {
std::array<config_param *, std::size_t(CONF_MAX)> params;

1
src/config/ConfigFile.cxx
View File

@ -20,6 +20,7 @@
#include "config.h"
#include "ConfigFile.hxx"
#include "ConfigData.hxx"
#include "Param.hxx"
#include "ConfigTemplates.hxx"
#include "util/Tokenizer.hxx"
#include "util/StringUtil.hxx"

1
src/config/ConfigGlobal.cxx
View File

@ -21,6 +21,7 @@
#include "ConfigGlobal.hxx"
#include "ConfigParser.hxx"
#include "ConfigData.hxx"
#include "Param.hxx"
#include "ConfigFile.hxx"
#include "ConfigPath.hxx"
#include "ConfigError.hxx"

2
src/config/ConfigData.cxx → src/config/Param.cxx
View File

@ -18,7 +18,7 @@
*/
#include "config.h"
#include "ConfigData.hxx"
#include "Param.hxx"
#include "ConfigPath.hxx"
#include "util/Error.hxx"
#include "fs/AllocatedPath.hxx"

104
src/config/Param.hxx Normal file
View File

@ -0,0 +1,104 @@
/*
* Copyright (C) 2003-2015 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_PARAM_HXX
#define MPD_CONFIG_PARAM_HXX
#include "Block.hxx"
#include "Compiler.h"
#include <string>
#include <vector>
class AllocatedPath;
class Error;
struct config_param {
/**
* The next config_param with the same name. The destructor
* deletes the whole chain.
*/
struct config_param *next;
std::string value;
unsigned int line;
std::vector<BlockParam> block_params;
/**
* This flag is false when nobody has queried the value of
* this option yet.
*/
bool used;
config_param(int _line=-1)
:next(nullptr), line(_line), used(false) {}
gcc_nonnull_all
config_param(const char *_value, int _line=-1);
config_param(const config_param &) = delete;
~config_param();
config_param &operator=(const config_param &) = delete;
/**
* Determine if this is a "null" instance, i.e. an empty
* object that was synthesized and not loaded from a
* configuration file.
*/
bool IsNull() const {
return line == unsigned(-1);
}
gcc_nonnull_all
void AddBlockParam(const char *_name, const char *_value,
int _line=-1) {
block_params.emplace_back(_name, _value, _line);
}
gcc_nonnull_all gcc_pure
const BlockParam *GetBlockParam(const char *_name) const;
gcc_pure
const char *GetBlockValue(const char *name,
const char *default_value=nullptr) const;
/**
* Same as config_get_path(), but looks up the setting in the
* specified block.
*/
AllocatedPath GetBlockPath(const char *name, const char *default_value,
Error &error) const;
AllocatedPath GetBlockPath(const char *name, Error &error) const;
gcc_pure
int GetBlockValue(const char *name, int default_value) const;
gcc_pure
unsigned GetBlockValue(const char *name, unsigned default_value) const;
gcc_pure
bool GetBlockValue(const char *name, bool default_value) const;
};
#endif

2
src/db/Configured.cxx
View File

@ -21,7 +21,7 @@
#include "Configured.hxx"
#include "DatabaseGlue.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigError.hxx"
#include "fs/AllocatedPath.hxx"
#include "fs/StandardDirectory.hxx"

2
src/db/DatabaseGlue.cxx
View File

@ -22,7 +22,7 @@
#include "Registry.hxx"
#include "DatabaseError.hxx"
#include "util/Error.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "DatabasePlugin.hxx"
#include <string.h>

2
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@ -30,7 +30,7 @@
#include "db/Stats.hxx"
#include "SongFilter.hxx"
#include "Compiler.h"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "tag/TagBuilder.hxx"
#include "tag/Tag.hxx"
#include "util/Error.hxx"

2
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@ -34,7 +34,7 @@
#include "fs/io/TextFile.hxx"
#include "fs/io/BufferedOutputStream.hxx"
#include "fs/io/FileOutputStream.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "fs/FileSystem.hxx"
#include "util/CharUtil.hxx"
#include "util/Error.hxx"

2
src/db/plugins/upnp/UpnpDatabasePlugin.cxx
View File

@ -33,7 +33,7 @@
#include "db/LightDirectory.hxx"
#include "db/LightSong.hxx"
#include "db/Stats.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "tag/TagBuilder.hxx"
#include "tag/TagTable.hxx"
#include "util/Error.hxx"

2
src/decoder/DecoderAPI.hxx
View File

@ -36,7 +36,7 @@
#include "tag/Tag.hxx"
#include "AudioFormat.hxx"
#include "MixRampInfo.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "Chrono.hxx"
// IWYU pragma: end_exports

2
src/decoder/DecoderList.cxx
View File

@ -21,7 +21,7 @@
#include "DecoderList.hxx"
#include "DecoderPlugin.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "plugins/AudiofileDecoderPlugin.hxx"
#include "plugins/PcmDecoderPlugin.hxx"
#include "plugins/DsdiffDecoderPlugin.hxx"

2
src/encoder/EncoderAPI.hxx
View File

@ -31,7 +31,7 @@
#include "EncoderPlugin.hxx"
#include "AudioFormat.hxx"
#include "tag/Tag.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
// IWYU pragma: end_exports

2
src/filter/FilterConfig.cxx
View File

@ -21,7 +21,7 @@
#include "FilterConfig.hxx"
#include "plugins/ChainFilterPlugin.hxx"
#include "FilterPlugin.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigOption.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigError.hxx"

2
src/filter/FilterPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "FilterPlugin.hxx"
#include "FilterRegistry.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigError.hxx"
#include "util/Error.hxx"

2
src/filter/plugins/AutoConvertFilterPlugin.cxx
View File

@ -24,7 +24,7 @@
#include "filter/FilterInternal.hxx"
#include "filter/FilterRegistry.hxx"
#include "AudioFormat.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "util/ConstBuffer.hxx"
#include <assert.h>

2
src/filter/plugins/RouteFilterPlugin.cxx
View File

@ -41,7 +41,7 @@
#include "config.h"
#include "config/ConfigError.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "AudioFormat.hxx"
#include "filter/FilterPlugin.hxx"
#include "filter/FilterInternal.hxx"

2
src/input/Init.cxx
View File

@ -24,7 +24,7 @@
#include "util/Error.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "Log.hxx"
#include <assert.h>

2
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@ -31,7 +31,7 @@
#include "system/ByteOrder.hxx"
#include "fs/AllocatedPath.hxx"
#include "Log.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigError.hxx"
#include <stdio.h>

2
src/input/plugins/CurlInputPlugin.cxx
View File

@ -23,7 +23,7 @@
#include "../IcyInputStream.hxx"
#include "../InputPlugin.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx"
#include "event/SocketMonitor.hxx"

2
src/mixer/plugins/OssMixerPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "config.h"
#include "mixer/MixerInternal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "system/fd_util.h"
#include "util/ASCII.hxx"
#include "util/Error.hxx"

2
src/mixer/plugins/SoftwareMixerPlugin.cxx
View File

@ -25,7 +25,7 @@
#include "filter/FilterInternal.hxx"
#include "filter/plugins/VolumeFilterPlugin.hxx"
#include "pcm/Volume.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "util/Error.hxx"
#include <assert.h>

2
src/neighbor/Glue.cxx
View File

@ -24,7 +24,7 @@
#include "NeighborPlugin.hxx"
#include "Info.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigError.hxx"
#include "util/Error.hxx"

2
src/output/MultipleOutputs.cxx
View File

@ -27,7 +27,7 @@
#include "MusicChunk.hxx"
#include "system/FatalError.hxx"
#include "util/Error.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "notify.hxx"

2
src/output/OutputAPI.hxx
View File

@ -26,7 +26,7 @@
#include "Internal.hxx"
#include "AudioFormat.hxx"
#include "tag/Tag.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
// IWYU pragma: end_exports

2
src/playlist/PlaylistRegistry.cxx
View File

@ -36,7 +36,7 @@
#include "util/Error.hxx"
#include "util/Macros.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "Log.hxx"
#include <assert.h>

2
src/playlist/plugins/SoundCloudPlaylistPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "SoundCloudPlaylistPlugin.hxx"
#include "../PlaylistPlugin.hxx"
#include "../MemorySongEnumerator.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "input/InputStream.hxx"
#include "tag/TagBuilder.hxx"
#include "util/StringUtil.hxx"

2
test/DumpDatabase.cxx
View File

@ -27,7 +27,7 @@
#include "db/LightSong.hxx"
#include "db/PlaylistVector.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "tag/TagConfig.hxx"
#include "fs/Path.hxx"
#include "event/Loop.hxx"

2
test/read_mixer.cxx
View File

@ -24,7 +24,7 @@
#include "pcm/Volume.hxx"
#include "Main.hxx"
#include "event/Loop.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "util/Error.hxx"
#include "Log.hxx"

2
test/run_encoder.cxx
View File

@ -24,7 +24,7 @@
#include "encoder/ToOutputStream.hxx"
#include "AudioFormat.hxx"
#include "AudioParser.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "util/Error.hxx"
#include "Log.hxx"

2
test/run_filter.cxx
View File

@ -18,7 +18,7 @@
*/
#include "config.h"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "fs/Path.hxx"
#include "AudioParser.hxx"

2
test/run_output.cxx
View File

@ -20,7 +20,7 @@
#include "config.h"
#include "output/Internal.hxx"
#include "output/OutputPlugin.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "config/ConfigGlobal.hxx"
#include "config/ConfigOption.hxx"
#include "Idle.hxx"

2
test/test_vorbis_encoder.cxx
View File

@ -23,7 +23,7 @@
#include "encoder/EncoderInterface.hxx"
#include "encoder/ToOutputStream.hxx"
#include "AudioFormat.hxx"
#include "config/ConfigData.hxx"
#include "config/Param.hxx"
#include "fs/io/StdioOutputStream.hxx"
#include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx"