Cleaned up playblack.h header file and usage of it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17276 a1c6a512-1295-4272-9138-f99709370657
diff --git a/apps/buffering.c b/apps/buffering.c
index 9dafa67..4d88ca0 100644
--- a/apps/buffering.c
+++ b/apps/buffering.c
@@ -45,7 +45,6 @@
#include "status.h"
#include "screens.h"
#include "playlist.h"
-#include "playback.h"
#include "pcmbuf.h"
#include "buffer.h"
#include "bmp.h"
diff --git a/apps/codecs.c b/apps/codecs.c
index 062487d..c8573fc 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -40,7 +40,6 @@
#include "buffer.h"
#include "buffering.h"
#include "mp3_playback.h"
-#include "playback.h"
#include "backlight.h"
#include "ata.h"
#include "talk.h"
diff --git a/apps/cuesheet.h b/apps/cuesheet.h
index d5a7504..e80b439 100644
--- a/apps/cuesheet.h
+++ b/apps/cuesheet.h
@@ -22,6 +22,8 @@
#include <stdbool.h>
#include "screens.h"
+#include "file.h"
+#include "id3.h"
#define MAX_NAME 80 /* Max length of information strings */
#define MAX_TRACKS 99 /* Max number of tracks in a cuesheet */
diff --git a/apps/metadata.h b/apps/metadata.h
index 00a1903..e7004ba 100644
--- a/apps/metadata.h
+++ b/apps/metadata.h
@@ -20,7 +20,9 @@
#ifndef _METADATA_H
#define _METADATA_H
-#include "playback.h"
+#include <stdbool.h>
+#include "config.h"
+#include "id3.h"
unsigned int probe_file_format(const char *filename);
bool get_metadata(struct mp3entry* id3, int fd, const char* trackname);
diff --git a/apps/playback.c b/apps/playback.c
index 222af76..a63e303 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -151,6 +151,14 @@
STATE_FINISHED, /* all remaining tracks have been added */
};
+#if MEM > 1
+#define MAX_TRACK 128
+#else
+#define MAX_TRACK 32
+#endif
+
+#define MAX_TRACK_MASK (MAX_TRACK-1)
+
/* As defined in plugins/lib/xxx2wav.h */
#if MEM > 1
#define MALLOC_BUFSIZE (512*1024)
diff --git a/apps/playback.h b/apps/playback.h
index cfb1509..103361c 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -21,20 +21,7 @@
#define _PLAYBACK_H
#include <stdbool.h>
-
-#include "id3.h"
-#include "mp3data.h"
-
-/* Not yet implemented. */
-#define CODEC_SET_AUDIOBUF_WATERMARK 4
-
-#if MEM > 1
-#define MAX_TRACK 128
-#else
-#define MAX_TRACK 32
-#endif
-
-#define MAX_TRACK_MASK (MAX_TRACK-1)
+#include "config.h"
/* Functions */
const char *get_codec_filename(int cod_spec);