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 insertions(+), 79 deletions(-)
diff --git a/src/audio.c b/src/audio.c
index 9f6bedc..34b74e6 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 92c3fe7..a1c68b8 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 <FLAC/format.h>
#include <FLAC/metadata.h>
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index 10c2f3d..fb69277 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 <FLAC/export.h>
#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
# include <FLAC/seekable_stream_decoder.h>
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index d24b2b4..a7525c2 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 6e53c64..f1c1d93 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 <faad.h>
diff --git a/src/inputPlugins/audiofile_plugin.c
b/src/inputPlugins/audiofile_plugin.c
index 558731d..edc2d4b 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 <audiofile.h>
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index a957e51..37adae8 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 23b16fa..21da583 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 <mikmod.h>
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index dcfc25c..982496a 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 <mad.h>
#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 7f13ca3..2731e5f 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 1003f15..440f413 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 <mpcdec/mpcdec.h>
diff --git a/src/inputPlugins/oggflac_plugin.c
b/src/inputPlugins/oggflac_plugin.c
index 379ff64..7fce155 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 359198b..1722a7e 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 <vorbis/vorbisfile.h>
diff --git a/src/inputPlugins/wavpack_plugin.c
b/src/inputPlugins/wavpack_plugin.c
index ef7c59b..1e1b975 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 <wavpack/wavpack.h>
diff --git a/src/outputBuffer.h b/src/outputBuffer.h
index 4aea591..da574f4 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 e474b47..bdce70b 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 623ae1f..031aef5 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 cf7f72c..0695c95 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 0a0ad6b..6b28cb6 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)
{
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
