diff --git a/Makefile.am b/Makefile.am index 6ea3012ea..862acac05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,6 @@ src_mpd_LDADD = \ mpd_headers = \ src/check.h \ src/command.h \ - src/conf.h \ src/gerror.h \ src/glib_compat.h \ src/gcc.h \ diff --git a/src/AudioConfig.cxx b/src/AudioConfig.cxx index 64c9d76d5..bb4bdfd65 100644 --- a/src/AudioConfig.cxx +++ b/src/AudioConfig.cxx @@ -21,7 +21,9 @@ #include "AudioConfig.hxx" #include "AudioFormat.hxx" #include "AudioParser.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "mpd_error.h" #include "util/Error.hxx" diff --git a/src/ClientGlobal.cxx b/src/ClientGlobal.cxx index 6115a7856..e79f3430b 100644 --- a/src/ClientGlobal.cxx +++ b/src/ClientGlobal.cxx @@ -20,9 +20,7 @@ #include "config.h" #include "ClientInternal.hxx" #include "ClientList.hxx" -#include "conf.h" - -#include +#include "ConfigGlobal.hxx" #define CLIENT_TIMEOUT_DEFAULT (60) #define CLIENT_MAX_COMMAND_LIST_DEFAULT (2048*1024) diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx index 71395fd0c..9fb388751 100644 --- a/src/CommandLine.cxx +++ b/src/CommandLine.cxx @@ -21,7 +21,7 @@ #include "CommandLine.hxx" #include "ls.hxx" #include "Log.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "DecoderList.hxx" #include "DecoderPlugin.hxx" #include "OutputList.hxx" diff --git a/src/ConfigFile.cxx b/src/ConfigFile.cxx index 595d6a1bf..b28c8904b 100644 --- a/src/ConfigFile.cxx +++ b/src/ConfigFile.cxx @@ -22,7 +22,6 @@ #include "ConfigError.hxx" #include "ConfigData.hxx" #include "ConfigTemplates.hxx" -#include "conf.h" #include "util/Tokenizer.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" diff --git a/src/ConfigPath.cxx b/src/ConfigPath.cxx index 9c5945a32..a1a73a63c 100644 --- a/src/ConfigPath.cxx +++ b/src/ConfigPath.cxx @@ -22,7 +22,8 @@ #include "fs/Path.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include diff --git a/src/DatabaseGlue.cxx b/src/DatabaseGlue.cxx index fb944dacc..e0e004bfa 100644 --- a/src/DatabaseGlue.cxx +++ b/src/DatabaseGlue.cxx @@ -25,7 +25,7 @@ #include "DatabaseError.hxx" #include "Directory.hxx" #include "util/Error.hxx" -#include "conf.h" +#include "ConfigData.hxx" extern "C" { #include "stats.h" diff --git a/src/DecoderAPI.hxx b/src/DecoderAPI.hxx index 36a4fa5c7..d514ef7cc 100644 --- a/src/DecoderAPI.hxx +++ b/src/DecoderAPI.hxx @@ -33,7 +33,7 @@ #include "replay_gain_info.h" #include "Tag.hxx" #include "AudioFormat.hxx" -#include "conf.h" +#include "ConfigData.hxx" /** * Notify the player thread that it has finished initialization and diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx index 5c1a486df..092c3dca9 100644 --- a/src/DecoderList.cxx +++ b/src/DecoderList.cxx @@ -20,7 +20,8 @@ #include "config.h" #include "DecoderList.hxx" #include "DecoderPlugin.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "mpd_error.h" #include "decoder/AudiofileDecoderPlugin.hxx" #include "decoder/PcmDecoderPlugin.hxx" diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx index 2c4b5bfb7..058626dfc 100644 --- a/src/DespotifyUtils.cxx +++ b/src/DespotifyUtils.cxx @@ -19,7 +19,8 @@ #include "DespotifyUtils.hxx" #include "Tag.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include diff --git a/src/EncoderAPI.hxx b/src/EncoderAPI.hxx index d430214d6..b401192e2 100644 --- a/src/EncoderAPI.hxx +++ b/src/EncoderAPI.hxx @@ -28,6 +28,6 @@ #include "EncoderPlugin.hxx" #include "AudioFormat.hxx" #include "Tag.hxx" -#include "conf.h" +#include "ConfigData.hxx" #endif diff --git a/src/FilterConfig.cxx b/src/FilterConfig.cxx index 8a3377c7d..b9f6fe20f 100644 --- a/src/FilterConfig.cxx +++ b/src/FilterConfig.cxx @@ -19,11 +19,13 @@ #include "config.h" #include "FilterConfig.hxx" -#include "conf.h" #include "filter/ChainFilterPlugin.hxx" #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" +#include "ConfigData.hxx" +#include "ConfigOption.hxx" +#include "ConfigGlobal.hxx" #include "ConfigError.hxx" #include "util/Error.hxx" diff --git a/src/FilterPlugin.cxx b/src/FilterPlugin.cxx index e9f256090..9afda3f73 100644 --- a/src/FilterPlugin.cxx +++ b/src/FilterPlugin.cxx @@ -21,7 +21,7 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "ConfigError.hxx" #include "util/Error.hxx" diff --git a/src/InputInit.cxx b/src/InputInit.cxx index 01ed57d5a..d39ca5325 100644 --- a/src/InputInit.cxx +++ b/src/InputInit.cxx @@ -23,7 +23,9 @@ #include "InputPlugin.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" +#include "ConfigData.hxx" #include #include diff --git a/src/Listen.cxx b/src/Listen.cxx index 6f6ff3f33..2813c6bfb 100644 --- a/src/Listen.cxx +++ b/src/Listen.cxx @@ -22,7 +22,9 @@ #include "Main.hxx" #include "Instance.hxx" #include "Client.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "event/ServerSocket.hxx" #include "util/Error.hxx" diff --git a/src/Log.cxx b/src/Log.cxx index 667480ce2..721e59862 100644 --- a/src/Log.cxx +++ b/src/Log.cxx @@ -19,7 +19,9 @@ #include "config.h" #include "Log.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "system/fd_util.h" #include "system/FatalError.hxx" #include "fs/Path.hxx" diff --git a/src/Main.cxx b/src/Main.cxx index 63008d87a..73cae630f 100644 --- a/src/Main.cxx +++ b/src/Main.cxx @@ -39,7 +39,6 @@ #include "Volume.hxx" #include "OutputAll.hxx" #include "Tag.hxx" -#include "conf.h" #include "replay_gain_config.h" #include "Idle.hxx" #include "SignalHandlers.hxx" @@ -57,7 +56,10 @@ #include "Daemon.hxx" #include "system/FatalError.hxx" #include "util/Error.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "ConfigDefaults.hxx" +#include "ConfigOption.hxx" extern "C" { #include "stats.h" diff --git a/src/OutputAPI.hxx b/src/OutputAPI.hxx index 9c79d9b81..cc7a0832d 100644 --- a/src/OutputAPI.hxx +++ b/src/OutputAPI.hxx @@ -24,6 +24,6 @@ #include "OutputInternal.hxx" #include "AudioFormat.hxx" #include "Tag.hxx" -#include "conf.h" +#include "ConfigData.hxx" #endif diff --git a/src/OutputAll.cxx b/src/OutputAll.cxx index 27a4e42f5..49505323c 100644 --- a/src/OutputAll.cxx +++ b/src/OutputAll.cxx @@ -28,7 +28,9 @@ #include "MusicChunk.hxx" #include "system/FatalError.hxx" #include "util/Error.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "notify.hxx" #include diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx index 17fff933a..79d457dad 100644 --- a/src/OutputInit.cxx +++ b/src/OutputInit.cxx @@ -35,6 +35,7 @@ #include "filter/ReplayGainFilterPlugin.hxx" #include "filter/ChainFilterPlugin.hxx" #include "ConfigError.hxx" +#include "ConfigGlobal.hxx" #include "util/Error.hxx" #include diff --git a/src/Permission.cxx b/src/Permission.cxx index 246047774..6f8782324 100644 --- a/src/Permission.cxx +++ b/src/Permission.cxx @@ -19,8 +19,10 @@ #include "config.h" #include "Permission.hxx" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "mpd_error.h" -#include "conf.h" #include #include diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx index c0413687f..85ddb7168 100644 --- a/src/PlaylistFile.cxx +++ b/src/PlaylistFile.cxx @@ -27,7 +27,8 @@ #include "Song.hxx" #include "Mapper.hxx" #include "TextFile.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "ConfigDefaults.hxx" #include "Idle.hxx" #include "fs/Path.hxx" diff --git a/src/PlaylistRegistry.cxx b/src/PlaylistRegistry.cxx index 51fd840b9..375e51d83 100644 --- a/src/PlaylistRegistry.cxx +++ b/src/PlaylistRegistry.cxx @@ -35,7 +35,8 @@ #include "util/UriUtil.hxx" #include "util/StringUtil.hxx" #include "util/Error.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "mpd_error.h" #include diff --git a/src/PlaylistState.cxx b/src/PlaylistState.cxx index d03de0a16..4b5d76c0a 100644 --- a/src/PlaylistState.cxx +++ b/src/PlaylistState.cxx @@ -28,7 +28,8 @@ #include "QueueSave.hxx" #include "TextFile.hxx" #include "PlayerControl.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include #include diff --git a/src/ReplayGainConfig.cxx b/src/ReplayGainConfig.cxx index ea5054bae..a921d2130 100644 --- a/src/ReplayGainConfig.cxx +++ b/src/ReplayGainConfig.cxx @@ -20,7 +20,8 @@ #include "config.h" #include "replay_gain_config.h" #include "Idle.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" #include "Playlist.hxx" #include "mpd_error.h" diff --git a/src/Tag.cxx b/src/Tag.cxx index 39560d49d..228db1a66 100644 --- a/src/Tag.cxx +++ b/src/Tag.cxx @@ -21,7 +21,8 @@ #include "Tag.hxx" #include "TagInternal.hxx" #include "TagPool.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "Song.hxx" #include "mpd_error.h" diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx index 1ef82bfba..bd104c564 100644 --- a/src/UpdateWalk.cxx +++ b/src/UpdateWalk.cxx @@ -31,7 +31,8 @@ #include "PlaylistRegistry.hxx" #include "Mapper.hxx" #include "ExcludeList.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "fs/Path.hxx" #include "fs/FileSystem.hxx" #include "fs/DirectoryReader.hxx" diff --git a/src/ZeroconfGlue.cxx b/src/ZeroconfGlue.cxx index 14e1d0866..6e50d07ef 100644 --- a/src/ZeroconfGlue.cxx +++ b/src/ZeroconfGlue.cxx @@ -21,7 +21,8 @@ #include "ZeroconfGlue.hxx" #include "ZeroconfAvahi.hxx" #include "ZeroconfBonjour.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "Listen.hxx" #include "gcc.h" diff --git a/src/conf.h b/src/conf.h deleted file mode 100644 index df01e466a..000000000 --- a/src/conf.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2003-2011 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_CONF_H -#define MPD_CONF_H - -#include "ConfigGlobal.hxx" -#include "ConfigOption.hxx" -#include "ConfigData.hxx" -#include "gcc.h" - -#endif diff --git a/src/db/ProxyDatabasePlugin.cxx b/src/db/ProxyDatabasePlugin.cxx index e0af53cee..fc8ea1535 100644 --- a/src/db/ProxyDatabasePlugin.cxx +++ b/src/db/ProxyDatabasePlugin.cxx @@ -26,7 +26,7 @@ #include "Directory.hxx" #include "Song.hxx" #include "gcc.h" -#include "conf.h" +#include "ConfigData.hxx" #include "Tag.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx index 56bdc2cb7..7ba86fb38 100644 --- a/src/db/SimpleDatabasePlugin.cxx +++ b/src/db/SimpleDatabasePlugin.cxx @@ -27,7 +27,7 @@ #include "DatabaseLock.hxx" #include "DatabaseError.hxx" #include "TextFile.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "fs/FileSystem.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/decoder/FluidsynthDecoderPlugin.cxx b/src/decoder/FluidsynthDecoderPlugin.cxx index 66345e293..533f02ef1 100644 --- a/src/decoder/FluidsynthDecoderPlugin.cxx +++ b/src/decoder/FluidsynthDecoderPlugin.cxx @@ -22,7 +22,6 @@ #include "DecoderAPI.hxx" #include "CheckAudioFormat.hxx" #include "util/Error.hxx" -#include "conf.h" #include diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index 8e390d52d..88a451412 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -21,7 +21,7 @@ #include "MadDecoderPlugin.hxx" #include "DecoderAPI.hxx" #include "InputStream.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "tag/TagId3.hxx" #include "tag/TagRva2.hxx" #include "TagHandler.hxx" diff --git a/src/filter/ChainFilterPlugin.cxx b/src/filter/ChainFilterPlugin.cxx index a24f533b1..90e196d76 100644 --- a/src/filter/ChainFilterPlugin.cxx +++ b/src/filter/ChainFilterPlugin.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "ChainFilterPlugin.hxx" -#include "conf.h" #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" diff --git a/src/filter/ConvertFilterPlugin.cxx b/src/filter/ConvertFilterPlugin.cxx index 3ef2be719..040f8426f 100644 --- a/src/filter/ConvertFilterPlugin.cxx +++ b/src/filter/ConvertFilterPlugin.cxx @@ -22,7 +22,6 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "conf.h" #include "pcm/PcmConvert.hxx" #include "util/Manual.hxx" #include "AudioFormat.hxx" diff --git a/src/filter/RouteFilterPlugin.cxx b/src/filter/RouteFilterPlugin.cxx index 20ef5e963..58c0b36d8 100644 --- a/src/filter/RouteFilterPlugin.cxx +++ b/src/filter/RouteFilterPlugin.cxx @@ -40,8 +40,8 @@ */ #include "config.h" -#include "conf.h" #include "ConfigError.hxx" +#include "ConfigData.hxx" #include "AudioFormat.hxx" #include "CheckAudioFormat.hxx" #include "FilterPlugin.hxx" diff --git a/src/filter/VolumeFilterPlugin.cxx b/src/filter/VolumeFilterPlugin.cxx index 4c51ac599..cfc638f52 100644 --- a/src/filter/VolumeFilterPlugin.cxx +++ b/src/filter/VolumeFilterPlugin.cxx @@ -22,7 +22,6 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "FilterRegistry.hxx" -#include "conf.h" #include "pcm/PcmVolume.hxx" #include "pcm/PcmBuffer.hxx" #include "AudioFormat.hxx" diff --git a/src/fs/Path.cxx b/src/fs/Path.cxx index cb808b36c..71e71a78b 100644 --- a/src/fs/Path.cxx +++ b/src/fs/Path.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "fs/Path.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "mpd_error.h" #include "gcc.h" diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx index 30e815a92..42fb99982 100644 --- a/src/input/CurlInputPlugin.cxx +++ b/src/input/CurlInputPlugin.cxx @@ -22,7 +22,8 @@ #include "InputInternal.hxx" #include "InputStream.hxx" #include "InputPlugin.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "Tag.hxx" #include "IcyMetaDataParser.hxx" #include "event/MultiSocketMonitor.hxx" diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx index 069f4e36f..2a5b48f3d 100644 --- a/src/mixer/PulseMixerPlugin.cxx +++ b/src/mixer/PulseMixerPlugin.cxx @@ -21,7 +21,6 @@ #include "PulseMixerPlugin.hxx" #include "MixerInternal.hxx" #include "output/PulseOutputPlugin.hxx" -#include "conf.h" #include "GlobalEvents.hxx" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/pcm/PcmResample.cxx b/src/pcm/PcmResample.cxx index 9ade8cf5b..e2ce095d1 100644 --- a/src/pcm/PcmResample.cxx +++ b/src/pcm/PcmResample.cxx @@ -21,7 +21,8 @@ #include "PcmResampleInternal.hxx" #ifdef HAVE_LIBSAMPLERATE -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #endif #include diff --git a/src/pcm/PcmResampleLibsamplerate.cxx b/src/pcm/PcmResampleLibsamplerate.cxx index 6710c2070..1ab9b1953 100644 --- a/src/pcm/PcmResampleLibsamplerate.cxx +++ b/src/pcm/PcmResampleLibsamplerate.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "PcmResampleInternal.hxx" -#include "conf.h" #include "util/Error.hxx" #include "util/Domain.hxx" diff --git a/src/playlist/LastFMPlaylistPlugin.cxx b/src/playlist/LastFMPlaylistPlugin.cxx index a4952cd1c..a727a21a4 100644 --- a/src/playlist/LastFMPlaylistPlugin.cxx +++ b/src/playlist/LastFMPlaylistPlugin.cxx @@ -21,7 +21,7 @@ #include "LastFMPlaylistPlugin.hxx" #include "PlaylistPlugin.hxx" #include "PlaylistRegistry.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "Song.hxx" #include "InputStream.hxx" #include "util/Error.hxx" diff --git a/src/playlist/SoundCloudPlaylistPlugin.cxx b/src/playlist/SoundCloudPlaylistPlugin.cxx index 0b38caeea..5679062cf 100644 --- a/src/playlist/SoundCloudPlaylistPlugin.cxx +++ b/src/playlist/SoundCloudPlaylistPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "SoundCloudPlaylistPlugin.hxx" #include "MemoryPlaylistProvider.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "InputStream.hxx" #include "Song.hxx" #include "Tag.hxx" diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx index 3f7605f5e..0bea92bb7 100644 --- a/src/tag/TagId3.cxx +++ b/src/tag/TagId3.cxx @@ -23,14 +23,13 @@ #include "TagTable.hxx" #include "Tag.hxx" #include "util/Error.hxx" +#include "ConfigGlobal.hxx" extern "C" { #include "riff.h" #include "aiff.h" } -#include "conf.h" - #include #include diff --git a/test/DumpDatabase.cxx b/test/DumpDatabase.cxx index cf86d91ff..03ea37ee6 100644 --- a/test/DumpDatabase.cxx +++ b/test/DumpDatabase.cxx @@ -24,7 +24,8 @@ #include "Directory.hxx" #include "Song.hxx" #include "PlaylistVector.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" +#include "ConfigData.hxx" #include "Tag.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" diff --git a/test/dump_playlist.cxx b/test/dump_playlist.cxx index 10cecf73d..c42a2c52b 100644 --- a/test/dump_playlist.cxx +++ b/test/dump_playlist.cxx @@ -22,7 +22,7 @@ #include "Song.hxx" #include "Directory.hxx" #include "InputStream.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "DecoderAPI.hxx" #include "DecoderList.hxx" #include "InputInit.hxx" diff --git a/test/dump_rva2.cxx b/test/dump_rva2.cxx index 2bc8e0a85..711786869 100644 --- a/test/dump_rva2.cxx +++ b/test/dump_rva2.cxx @@ -21,7 +21,7 @@ #include "tag/TagId3.hxx" #include "tag/TagRva2.hxx" #include "replay_gain_info.h" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "Tag.hxx" #include "util/Error.hxx" diff --git a/test/dump_text_file.cxx b/test/dump_text_file.cxx index 11ac8b3d0..286c63c93 100644 --- a/test/dump_text_file.cxx +++ b/test/dump_text_file.cxx @@ -21,7 +21,7 @@ #include "IOThread.hxx" #include "InputInit.hxx" #include "InputStream.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "stdbin.h" #include "TextInputStream.hxx" #include "util/Error.hxx" diff --git a/test/read_conf.cxx b/test/read_conf.cxx index 55ff8c068..d5eacec67 100644 --- a/test/read_conf.cxx +++ b/test/read_conf.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "fs/Path.hxx" #include "util/Error.hxx" diff --git a/test/run_convert.cxx b/test/run_convert.cxx index 72e457338..939e279d0 100644 --- a/test/run_convert.cxx +++ b/test/run_convert.cxx @@ -27,7 +27,7 @@ #include "AudioParser.hxx" #include "AudioFormat.hxx" #include "pcm/PcmConvert.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "util/fifo_buffer.h" #include "util/Error.hxx" #include "stdbin.h" diff --git a/test/run_encoder.cxx b/test/run_encoder.cxx index 46edc9618..838ee708e 100644 --- a/test/run_encoder.cxx +++ b/test/run_encoder.cxx @@ -22,7 +22,7 @@ #include "EncoderPlugin.hxx" #include "AudioFormat.hxx" #include "AudioParser.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "util/Error.hxx" #include "stdbin.h" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 62f8dde31..085fc256b 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -18,7 +18,8 @@ */ #include "config.h" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" #include "fs/Path.hxx" #include "AudioParser.hxx" #include "AudioFormat.hxx" diff --git a/test/run_input.cxx b/test/run_input.cxx index 051c3a803..9f44276f3 100644 --- a/test/run_input.cxx +++ b/test/run_input.cxx @@ -21,7 +21,7 @@ #include "TagSave.hxx" #include "stdbin.h" #include "Tag.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "InputStream.hxx" #include "InputInit.hxx" #include "IOThread.hxx" diff --git a/test/run_output.cxx b/test/run_output.cxx index 59c1a543e..91cffbaf8 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -21,7 +21,9 @@ #include "OutputControl.hxx" #include "OutputInternal.hxx" #include "OutputPlugin.hxx" -#include "conf.h" +#include "ConfigData.hxx" +#include "ConfigGlobal.hxx" +#include "ConfigOption.hxx" #include "Idle.hxx" #include "Main.hxx" #include "event/Loop.hxx" diff --git a/test/test_vorbis_encoder.cxx b/test/test_vorbis_encoder.cxx index 3d1ac535b..676237ccb 100644 --- a/test/test_vorbis_encoder.cxx +++ b/test/test_vorbis_encoder.cxx @@ -21,7 +21,7 @@ #include "EncoderList.hxx" #include "EncoderPlugin.hxx" #include "AudioFormat.hxx" -#include "conf.h" +#include "ConfigData.hxx" #include "stdbin.h" #include "Tag.hxx" #include "util/Error.hxx" diff --git a/test/visit_archive.cxx b/test/visit_archive.cxx index b059f16f9..68dfd1988 100644 --- a/test/visit_archive.cxx +++ b/test/visit_archive.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "stdbin.h" #include "Tag.hxx" -#include "conf.h" +#include "ConfigGlobal.hxx" #include "IOThread.hxx" #include "InputInit.hxx" #include "ArchiveList.hxx"