aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-11 07:51:27 +0200
committerMax Kellermann <max@duempel.org>2011-09-11 07:55:51 +0200
commitaede71b1dcda4dacc566f11d47188c85a3ee8dd2 (patch)
tree09c6a3b51381d22929cd8336b9acd6ecc0e47035
parent14d573cbf1e540a87bed3e9384ba16fed990cc4f (diff)
downloadmpd-aede71b1dcda4dacc566f11d47188c85a3ee8dd2.tar.gz
mpd-aede71b1dcda4dacc566f11d47188c85a3ee8dd2.tar.xz
mpd-aede71b1dcda4dacc566f11d47188c85a3ee8dd2.zip
playlist: move enum playlist_result to playlist_error.h
Reduce header dependencies.
Diffstat (limited to '')
-rw-r--r--Makefile.am1
-rw-r--r--src/playlist.h15
-rw-r--r--src/playlist_error.h37
-rw-r--r--src/playlist_print.c1
-rw-r--r--src/playlist_queue.c1
-rw-r--r--src/playlist_queue.h3
-rw-r--r--src/playlist_save.c2
-rw-r--r--src/playlist_save.h5
-rw-r--r--src/stored_playlist.h2
9 files changed, 50 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index fd34b74e4..b883531f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,6 +166,7 @@ mpd_headers = \
src/player_thread.h \
src/player_control.h \
src/playlist.h \
+ src/playlist_error.h \
src/playlist_internal.h \
src/playlist_print.h \
src/playlist_save.h \
diff --git a/src/playlist.h b/src/playlist.h
index 83416e5df..4c5f29e5d 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -21,25 +21,12 @@
#define MPD_PLAYLIST_H
#include "queue.h"
+#include "playlist_error.h"
#include <stdbool.h>
struct player_control;
-enum playlist_result {
- PLAYLIST_RESULT_SUCCESS,
- PLAYLIST_RESULT_ERRNO,
- PLAYLIST_RESULT_DENIED,
- PLAYLIST_RESULT_NO_SUCH_SONG,
- PLAYLIST_RESULT_NO_SUCH_LIST,
- PLAYLIST_RESULT_LIST_EXISTS,
- PLAYLIST_RESULT_BAD_NAME,
- PLAYLIST_RESULT_BAD_RANGE,
- PLAYLIST_RESULT_NOT_PLAYING,
- PLAYLIST_RESULT_TOO_LARGE,
- PLAYLIST_RESULT_DISABLED,
-};
-
struct playlist {
/**
* The song queue - it contains the "real" playlist.
diff --git a/src/playlist_error.h b/src/playlist_error.h
new file mode 100644
index 000000000..9ecb28e95
--- /dev/null
+++ b/src/playlist_error.h
@@ -0,0 +1,37 @@
+/*
+ * 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_PLAYLIST_ERROR_H
+#define MPD_PLAYLIST_ERROR_H
+
+enum playlist_result {
+ PLAYLIST_RESULT_SUCCESS,
+ PLAYLIST_RESULT_ERRNO,
+ PLAYLIST_RESULT_DENIED,
+ PLAYLIST_RESULT_NO_SUCH_SONG,
+ PLAYLIST_RESULT_NO_SUCH_LIST,
+ PLAYLIST_RESULT_LIST_EXISTS,
+ PLAYLIST_RESULT_BAD_NAME,
+ PLAYLIST_RESULT_BAD_RANGE,
+ PLAYLIST_RESULT_NOT_PLAYING,
+ PLAYLIST_RESULT_TOO_LARGE,
+ PLAYLIST_RESULT_DISABLED,
+};
+
+#endif
diff --git a/src/playlist_print.c b/src/playlist_print.c
index 041005a55..40b50545b 100644
--- a/src/playlist_print.c
+++ b/src/playlist_print.c
@@ -23,6 +23,7 @@
#include "playlist_plugin.h"
#include "playlist_any.h"
#include "playlist_song.h"
+#include "playlist.h"
#include "queue_print.h"
#include "stored_playlist.h"
#include "song_print.h"
diff --git a/src/playlist_queue.c b/src/playlist_queue.c
index 41df882b4..d368fcb23 100644
--- a/src/playlist_queue.c
+++ b/src/playlist_queue.c
@@ -22,6 +22,7 @@
#include "playlist_plugin.h"
#include "playlist_any.h"
#include "playlist_song.h"
+#include "playlist.h"
#include "song.h"
#include "input_stream.h"
diff --git a/src/playlist_queue.h b/src/playlist_queue.h
index 0429f26b6..3ae63bc16 100644
--- a/src/playlist_queue.h
+++ b/src/playlist_queue.h
@@ -24,12 +24,13 @@
#ifndef MPD_PLAYLIST_QUEUE_H
#define MPD_PLAYLIST_QUEUE_H
-#include "playlist.h"
+#include "playlist_error.h"
#include <stdbool.h>
struct playlist_provider;
struct playlist;
+struct player_control;
/**
* Loads the contents of a playlist and append it to the specified
diff --git a/src/playlist_save.c b/src/playlist_save.c
index 04818173c..e86cbcec1 100644
--- a/src/playlist_save.c
+++ b/src/playlist_save.c
@@ -19,7 +19,9 @@
#include "config.h"
#include "playlist_save.h"
+#include "playlist.h"
#include "stored_playlist.h"
+#include "queue.h"
#include "song.h"
#include "mapper.h"
#include "path.h"
diff --git a/src/playlist_save.h b/src/playlist_save.h
index cf911b3e4..fcee9e8bf 100644
--- a/src/playlist_save.h
+++ b/src/playlist_save.h
@@ -20,11 +20,14 @@
#ifndef MPD_PLAYLIST_SAVE_H
#define MPD_PLAYLIST_SAVE_H
-#include "playlist.h"
+#include "playlist_error.h"
#include <stdio.h>
struct song;
+struct queue;
+struct playlist;
+struct player_control;
void
playlist_print_song(FILE *fp, const struct song *song);
diff --git a/src/stored_playlist.h b/src/stored_playlist.h
index b1fdb6f85..3aa3b6cdc 100644
--- a/src/stored_playlist.h
+++ b/src/stored_playlist.h
@@ -20,7 +20,7 @@
#ifndef MPD_STORED_PLAYLIST_H
#define MPD_STORED_PLAYLIST_H
-#include "playlist.h"
+#include "playlist_error.h"
#include <glib.h>
#include <stdbool.h>