conf.h: remove obsolete header

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 \

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"
 

src/ClientGlobal.cxx

@@ -20,9 +20,7 @@
 #include "config.h"
 #include "ClientInternal.hxx"
 #include "ClientList.hxx"
-#include "conf.h"
-
-#include <assert.h>
+#include "ConfigGlobal.hxx"
 
 #define CLIENT_TIMEOUT_DEFAULT			(60)
 #define CLIENT_MAX_COMMAND_LIST_DEFAULT		(2048*1024)

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"

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"

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 <glib.h>
 

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"

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

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"

src/DespotifyUtils.cxx

@@ -19,7 +19,8 @@
 
 #include "DespotifyUtils.hxx"
 #include "Tag.hxx"
-#include "conf.h"
+#include "ConfigGlobal.hxx"
+#include "ConfigOption.hxx"
 
 #include <glib.h>
 

src/EncoderAPI.hxx

@@ -28,6 +28,6 @@
 #include "EncoderPlugin.hxx"
 #include "AudioFormat.hxx"
 #include "Tag.hxx"
-#include "conf.h"
+#include "ConfigData.hxx"
 
 #endif

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"
 

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"
 

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 <assert.h>
 #include <string.h>

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"
 

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"

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"

src/OutputAPI.hxx

@@ -24,6 +24,6 @@
 #include "OutputInternal.hxx"
 #include "AudioFormat.hxx"
 #include "Tag.hxx"
-#include "conf.h"
+#include "ConfigData.hxx"
 
 #endif

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 <assert.h>

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 <glib.h>

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 <map>
 #include <string>

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"

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 <assert.h>

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 <string.h>
 #include <stdlib.h>

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"
 

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"
 

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"

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"
 

src/conf.h

-/*
- * 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

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"

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"

src/decoder/FluidsynthDecoderPlugin.cxx

@@ -22,7 +22,6 @@
 #include "DecoderAPI.hxx"
 #include "CheckAudioFormat.hxx"
 #include "util/Error.hxx"
-#include "conf.h"
 
 #include <glib.h>
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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 <string.h>

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"
 

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"

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"

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 <glib.h>
 #include <id3tag.h>
 

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"

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"

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"
 

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"

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"
 

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"

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"
 

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"

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"

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"

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"

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"