diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/buffering.c | 1 | ||||
-rw-r--r-- | apps/codecs.c | 1 | ||||
-rw-r--r-- | apps/cuesheet.h | 2 | ||||
-rw-r--r-- | apps/metadata.h | 4 | ||||
-rw-r--r-- | apps/playback.c | 8 | ||||
-rw-r--r-- | apps/playback.h | 15 |
6 files changed, 14 insertions, 17 deletions
diff --git a/apps/buffering.c b/apps/buffering.c index 9dafa673b0..4d88ca0faf 100644 --- a/apps/buffering.c +++ b/apps/buffering.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include "status.h" | 45 | #include "status.h" |
46 | #include "screens.h" | 46 | #include "screens.h" |
47 | #include "playlist.h" | 47 | #include "playlist.h" |
48 | #include "playback.h" | ||
49 | #include "pcmbuf.h" | 48 | #include "pcmbuf.h" |
50 | #include "buffer.h" | 49 | #include "buffer.h" |
51 | #include "bmp.h" | 50 | #include "bmp.h" |
diff --git a/apps/codecs.c b/apps/codecs.c index 062487d6c8..c8573fc84a 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include "buffer.h" | 40 | #include "buffer.h" |
41 | #include "buffering.h" | 41 | #include "buffering.h" |
42 | #include "mp3_playback.h" | 42 | #include "mp3_playback.h" |
43 | #include "playback.h" | ||
44 | #include "backlight.h" | 43 | #include "backlight.h" |
45 | #include "ata.h" | 44 | #include "ata.h" |
46 | #include "talk.h" | 45 | #include "talk.h" |
diff --git a/apps/cuesheet.h b/apps/cuesheet.h index d5a7504b49..e80b4396df 100644 --- a/apps/cuesheet.h +++ b/apps/cuesheet.h | |||
@@ -22,6 +22,8 @@ | |||
22 | 22 | ||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "screens.h" | 24 | #include "screens.h" |
25 | #include "file.h" | ||
26 | #include "id3.h" | ||
25 | 27 | ||
26 | #define MAX_NAME 80 /* Max length of information strings */ | 28 | #define MAX_NAME 80 /* Max length of information strings */ |
27 | #define MAX_TRACKS 99 /* Max number of tracks in a cuesheet */ | 29 | #define MAX_TRACKS 99 /* Max number of tracks in a cuesheet */ |
diff --git a/apps/metadata.h b/apps/metadata.h index 00a1903a5d..e7004baaba 100644 --- a/apps/metadata.h +++ b/apps/metadata.h | |||
@@ -20,7 +20,9 @@ | |||
20 | #ifndef _METADATA_H | 20 | #ifndef _METADATA_H |
21 | #define _METADATA_H | 21 | #define _METADATA_H |
22 | 22 | ||
23 | #include "playback.h" | 23 | #include <stdbool.h> |
24 | #include "config.h" | ||
25 | #include "id3.h" | ||
24 | 26 | ||
25 | unsigned int probe_file_format(const char *filename); | 27 | unsigned int probe_file_format(const char *filename); |
26 | bool get_metadata(struct mp3entry* id3, int fd, const char* trackname); | 28 | bool get_metadata(struct mp3entry* id3, int fd, const char* trackname); |
diff --git a/apps/playback.c b/apps/playback.c index 222af769b1..a63e303877 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -151,6 +151,14 @@ enum filling_state { | |||
151 | STATE_FINISHED, /* all remaining tracks have been added */ | 151 | STATE_FINISHED, /* all remaining tracks have been added */ |
152 | }; | 152 | }; |
153 | 153 | ||
154 | #if MEM > 1 | ||
155 | #define MAX_TRACK 128 | ||
156 | #else | ||
157 | #define MAX_TRACK 32 | ||
158 | #endif | ||
159 | |||
160 | #define MAX_TRACK_MASK (MAX_TRACK-1) | ||
161 | |||
154 | /* As defined in plugins/lib/xxx2wav.h */ | 162 | /* As defined in plugins/lib/xxx2wav.h */ |
155 | #if MEM > 1 | 163 | #if MEM > 1 |
156 | #define MALLOC_BUFSIZE (512*1024) | 164 | #define MALLOC_BUFSIZE (512*1024) |
diff --git a/apps/playback.h b/apps/playback.h index cfb1509b04..103361c507 100644 --- a/apps/playback.h +++ b/apps/playback.h | |||
@@ -21,20 +21,7 @@ | |||
21 | #define _PLAYBACK_H | 21 | #define _PLAYBACK_H |
22 | 22 | ||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | 24 | #include "config.h" | |
25 | #include "id3.h" | ||
26 | #include "mp3data.h" | ||
27 | |||
28 | /* Not yet implemented. */ | ||
29 | #define CODEC_SET_AUDIOBUF_WATERMARK 4 | ||
30 | |||
31 | #if MEM > 1 | ||
32 | #define MAX_TRACK 128 | ||
33 | #else | ||
34 | #define MAX_TRACK 32 | ||
35 | #endif | ||
36 | |||
37 | #define MAX_TRACK_MASK (MAX_TRACK-1) | ||
38 | 25 | ||
39 | /* Functions */ | 26 | /* Functions */ |
40 | const char *get_codec_filename(int cod_spec); | 27 | const char *get_codec_filename(int cod_spec); |