aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-04 17:26:12 +0100
committerMax Kellermann <max@duempel.org>2009-01-04 17:26:12 +0100
commit77d3643036573ad55cdfc45ed197996d7a5c28d2 (patch)
tree2e52ce2bf1aa5bcbbda94652c325b9bf20adcd98
parent599d5820bce424625e54e2486191437a012ff1dc (diff)
downloadmpd-77d3643036573ad55cdfc45ed197996d7a5c28d2.tar.gz
mpd-77d3643036573ad55cdfc45ed197996d7a5c28d2.tar.xz
mpd-77d3643036573ad55cdfc45ed197996d7a5c28d2.zip
ls: include cleanup
Don't include headers which are not used. Fix some includes in decoder_thread.c.
-rw-r--r--src/decoder_thread.c3
-rw-r--r--src/ls.c10
-rw-r--r--src/ls.h3
3 files changed, 7 insertions, 9 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index 3baa228e3..e6e521764 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -20,6 +20,7 @@
#include "decoder_thread.h"
#include "decoder_control.h"
#include "decoder_internal.h"
+#include "decoder_list.h"
#include "player_control.h"
#include "pipe.h"
#include "song.h"
@@ -30,6 +31,8 @@
#include <glib.h>
+#include <unistd.h>
+
static bool
decoder_stream_decode(const struct decoder_plugin *plugin,
struct decoder *decoder,
diff --git a/src/ls.c b/src/ls.c
index 1d5c56661..85f0d266c 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -17,12 +17,10 @@
*/
#include "ls.h"
-#include "playlist.h"
-#include "path.h"
#include "client.h"
-#include "log.h"
-#include "stored_playlist.h"
#include "config.h"
+#include "decoder_list.h"
+#include "archive_list.h"
#include <string.h>
@@ -78,8 +76,8 @@ hasMusicSuffix(const char *utf8file, unsigned int next)
if (s) {
ret = decoder_plugin_from_suffix(s, next);
} else {
- DEBUG("hasMusicSuffix: The file: %s has no valid suffix\n",
- utf8file);
+ g_debug("hasMusicSuffix: The file: %s has no valid suffix\n",
+ utf8file);
}
return ret;
diff --git a/src/ls.h b/src/ls.h
index 713b6ac20..711e33d6e 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -19,9 +19,6 @@
#ifndef MPD_LS_H
#define MPD_LS_H
-#include "decoder_list.h"
-#include "archive_list.h"
-
#include <stdbool.h>
struct stat;