From b6909da758f90e8f4aeea1309030364b8d6e0505 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:03 +0200 Subject: clean up CPP includes Include only headers which are really required. This speeds up compilation and helps detect cross-layer accesses. --- src/audio.c | 1 - src/inputPlugins/_flac_common.c | 6 ------ src/inputPlugins/_flac_common.h | 4 ---- src/inputPlugins/_ogg_common.c | 1 - src/inputPlugins/aac_plugin.c | 4 ---- src/inputPlugins/audiofile_plugin.c | 5 ----- src/inputPlugins/flac_plugin.c | 6 ------ src/inputPlugins/mod_plugin.c | 4 ---- src/inputPlugins/mp3_plugin.c | 5 ----- src/inputPlugins/mp4_plugin.c | 6 ------ src/inputPlugins/mpc_plugin.c | 6 ------ src/inputPlugins/oggflac_plugin.c | 6 ------ src/inputPlugins/oggvorbis_plugin.c | 6 ------ src/inputPlugins/wavpack_plugin.c | 5 ----- src/outputBuffer.h | 1 - src/player.c | 8 -------- src/player.h | 2 +- src/playerData.h | 2 -- src/sig_handlers.c | 2 -- 19 files changed, 1 insertion(+), 79 deletions(-) diff --git a/src/audio.c b/src/audio.c index 9f6bedc33..34b74e6e1 100644 --- a/src/audio.c +++ b/src/audio.c @@ -20,7 +20,6 @@ #include "audioOutput.h" #include "log.h" #include "command.h" -#include "playerData.h" #include "path.h" #include "ack.h" #include "myfprintf.h" diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c index 92c3fe716..a1c68b8ea 100644 --- a/src/inputPlugins/_flac_common.c +++ b/src/inputPlugins/_flac_common.c @@ -26,12 +26,6 @@ #include "_flac_common.h" #include "../log.h" -#include "../tag.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../decode.h" -#include "../replayGain.h" -#include "../os_compat.h" #include #include diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h index 10c2f3d38..fb69277ff 100644 --- a/src/inputPlugins/_flac_common.h +++ b/src/inputPlugins/_flac_common.h @@ -26,10 +26,6 @@ #if defined(HAVE_FLAC) || defined(HAVE_OGGFLAC) -#include "../tag.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../decode.h" #include #if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 # include diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c index d24b2b47b..a7525c2de 100644 --- a/src/inputPlugins/_ogg_common.c +++ b/src/inputPlugins/_ogg_common.c @@ -28,7 +28,6 @@ (defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7) #include "../utils.h" -#include "../os_compat.h" ogg_stream_type ogg_stream_type_detect(InputStream * inStream) { diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c index 6e53c6420..f1c1d9303 100644 --- a/src/inputPlugins/aac_plugin.c +++ b/src/inputPlugins/aac_plugin.c @@ -23,11 +23,7 @@ #define AAC_MAX_CHANNELS 6 #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../os_compat.h" #include diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c index 558731dd3..edc2d4b90 100644 --- a/src/inputPlugins/audiofile_plugin.c +++ b/src/inputPlugins/audiofile_plugin.c @@ -22,12 +22,7 @@ #ifdef HAVE_AUDIOFILE -#include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../playerData.h" -#include "../os_compat.h" #include diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c index a957e5107..37adae810 100644 --- a/src/inputPlugins/flac_plugin.c +++ b/src/inputPlugins/flac_plugin.c @@ -22,12 +22,6 @@ #include "../utils.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../replayGain.h" -#include "../audio.h" -#include "../os_compat.h" /* this code was based on flac123, from flac-tools */ diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c index 23b16fa23..21da58328 100644 --- a/src/inputPlugins/mod_plugin.c +++ b/src/inputPlugins/mod_plugin.c @@ -21,11 +21,7 @@ #ifdef HAVE_MIKMOD #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../playerData.h" -#include "../os_compat.h" #include diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c index dcfc25cdc..982496acb 100644 --- a/src/inputPlugins/mp3_plugin.c +++ b/src/inputPlugins/mp3_plugin.c @@ -20,7 +20,6 @@ #ifdef HAVE_MAD -#include "../pcm_utils.h" #include #ifdef HAVE_ID3TAG @@ -29,12 +28,8 @@ #include "../log.h" #include "../utils.h" -#include "../replayGain.h" -#include "../tag.h" #include "../conf.h" -#include "../os_compat.h" - #define FRAMES_CUSHION 2000 #define READ_BUFFER_SIZE 40960 diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c index 7f13ca344..2731e5fbe 100644 --- a/src/inputPlugins/mp4_plugin.c +++ b/src/inputPlugins/mp4_plugin.c @@ -21,13 +21,7 @@ #ifdef HAVE_FAAD #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../decode.h" -#include "../os_compat.h" #include "../mp4ff/mp4ff.h" diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c index 1003f15d5..440f41373 100644 --- a/src/inputPlugins/mpc_plugin.c +++ b/src/inputPlugins/mpc_plugin.c @@ -21,13 +21,7 @@ #ifdef HAVE_MPCDEC #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../replayGain.h" -#include "../os_compat.h" #include diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c index 379ff6466..7fce1551b 100644 --- a/src/inputPlugins/oggflac_plugin.c +++ b/src/inputPlugins/oggflac_plugin.c @@ -27,12 +27,6 @@ #include "../utils.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../replayGain.h" -#include "../audio.h" -#include "../os_compat.h" static void oggflac_cleanup(FlacData * data, OggFLAC__SeekableStreamDecoder * decoder) diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c index 359198b17..1722a7ed0 100644 --- a/src/inputPlugins/oggvorbis_plugin.c +++ b/src/inputPlugins/oggvorbis_plugin.c @@ -25,13 +25,7 @@ #include "_ogg_common.h" #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../inputStream.h" -#include "../outputBuffer.h" -#include "../replayGain.h" -#include "../os_compat.h" #ifndef HAVE_TREMOR #include diff --git a/src/inputPlugins/wavpack_plugin.c b/src/inputPlugins/wavpack_plugin.c index ef7c59b8e..1e1b97593 100644 --- a/src/inputPlugins/wavpack_plugin.c +++ b/src/inputPlugins/wavpack_plugin.c @@ -23,12 +23,7 @@ #ifdef HAVE_WAVPACK #include "../utils.h" -#include "../audio.h" #include "../log.h" -#include "../pcm_utils.h" -#include "../playerData.h" -#include "../outputBuffer.h" -#include "../os_compat.h" #include "../path.h" #include diff --git a/src/outputBuffer.h b/src/outputBuffer.h index 4aea59120..da574f4b5 100644 --- a/src/outputBuffer.h +++ b/src/outputBuffer.h @@ -21,7 +21,6 @@ #include "pcm_utils.h" #include "mpd_types.h" -#include "decode.h" #include "inputStream.h" #include "replayGain.h" diff --git a/src/player.c b/src/player.c index e474b47dd..bdce70bbf 100644 --- a/src/player.c +++ b/src/player.c @@ -20,16 +20,8 @@ #include "path.h" #include "decode.h" #include "command.h" -#include "interface.h" -#include "playlist.h" -#include "ls.h" -#include "listen.h" #include "log.h" -#include "utils.h" -#include "directory.h" -#include "volume.h" #include "playerData.h" -#include "permission.h" #include "ack.h" #include "os_compat.h" #include "main_notify.h" diff --git a/src/player.h b/src/player.h index 623ae1fb0..031aef53d 100644 --- a/src/player.h +++ b/src/player.h @@ -19,7 +19,7 @@ #ifndef PLAYER_H #define PLAYER_H -#include "decode.h" +#include "notify.h" #include "mpd_types.h" #include "song.h" #include "os_compat.h" diff --git a/src/playerData.h b/src/playerData.h index cf7f72cf0..0695c95ea 100644 --- a/src/playerData.h +++ b/src/playerData.h @@ -19,10 +19,8 @@ #ifndef PLAYER_DATA_H #define PLAYER_DATA_H -#include "audio.h" #include "player.h" #include "decode.h" -#include "mpd_types.h" #include "outputBuffer.h" extern unsigned int buffered_before_play; diff --git a/src/sig_handlers.c b/src/sig_handlers.c index 0a0ad6b1e..6b28cb675 100644 --- a/src/sig_handlers.c +++ b/src/sig_handlers.c @@ -23,8 +23,6 @@ #include "command.h" #include "signal_check.h" #include "log.h" -#include "player.h" -#include "decode.h" int handlePendingSignals(void) { -- cgit v1.2.3