diff options
| author | Bertrik Sikken <bertrik@sikken.nl> | 2008-04-27 19:56:16 +0000 |
|---|---|---|
| committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-04-27 19:56:16 +0000 |
| commit | 43414807da1dd44f39d3cb0e3f1a38363b5853e8 (patch) | |
| tree | 7ccd324303ea118b5fab0ab3ac0fab627c16c205 | |
| parent | b88059b96996cf8bce35893e9c73ba3c6109d27e (diff) | |
| download | rockbox-43414807da1dd44f39d3cb0e3f1a38363b5853e8.tar.gz rockbox-43414807da1dd44f39d3cb0e3f1a38363b5853e8.zip | |
Updated use of events.h header file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17267 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/playback.h | 1 | ||||
| -rw-r--r-- | apps/tagtree.c | 1 | ||||
| -rw-r--r-- | firmware/export/mpeg.h | 17 |
3 files changed, 9 insertions, 10 deletions
diff --git a/apps/playback.h b/apps/playback.h index 9951cc2a0d..cfb1509b04 100644 --- a/apps/playback.h +++ b/apps/playback.h | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include "id3.h" | 25 | #include "id3.h" |
| 26 | #include "mp3data.h" | 26 | #include "mp3data.h" |
| 27 | #include "events.h" | ||
| 28 | 27 | ||
| 29 | /* Not yet implemented. */ | 28 | /* Not yet implemented. */ |
| 30 | #define CODEC_SET_AUDIOBUF_WATERMARK 4 | 29 | #define CODEC_SET_AUDIOBUF_WATERMARK 4 |
diff --git a/apps/tagtree.c b/apps/tagtree.c index f9646a0b00..53c8bd032c 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include "misc.h" | 46 | #include "misc.h" |
| 47 | #include "filetypes.h" | 47 | #include "filetypes.h" |
| 48 | #include "audio.h" | 48 | #include "audio.h" |
| 49 | #include "events.h" | ||
| 49 | 50 | ||
| 50 | #define FILE_SEARCH_INSTRUCTIONS ROCKBOX_DIR "/tagnavi.config" | 51 | #define FILE_SEARCH_INSTRUCTIONS ROCKBOX_DIR "/tagnavi.config" |
| 51 | 52 | ||
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h index 0a9d62cdf0..d9665a9531 100644 --- a/firmware/export/mpeg.h +++ b/firmware/export/mpeg.h | |||
| @@ -21,22 +21,21 @@ | |||
| 21 | 21 | ||
| 22 | #include <stdbool.h> | 22 | #include <stdbool.h> |
| 23 | #include "id3.h" | 23 | #include "id3.h" |
| 24 | #include "events.h" | ||
| 25 | 24 | ||
| 26 | #define MPEG_SWAP_CHUNKSIZE 0x2000 | 25 | #define MPEG_SWAP_CHUNKSIZE 0x2000 |
| 27 | #define MPEG_HIGH_WATER 2 /* We leave 2 bytes empty because otherwise we | 26 | #define MPEG_HIGH_WATER 2 /* We leave 2 bytes empty because otherwise we |
| 28 | wouldn't be able to see the difference between | 27 | wouldn't be able to see the difference between |
| 29 | an empty buffer and a full one. */ | 28 | an empty buffer and a full one. */ |
| 30 | #define MPEG_LOW_WATER 0x60000 | 29 | #define MPEG_LOW_WATER 0x60000 |
| 31 | #define MPEG_RECORDING_LOW_WATER 0x80000 | 30 | #define MPEG_RECORDING_LOW_WATER 0x80000 |
| 32 | #define MPEG_LOW_WATER_CHUNKSIZE 0x40000 | 31 | #define MPEG_LOW_WATER_CHUNKSIZE 0x40000 |
| 33 | #define MPEG_LOW_WATER_SWAP_CHUNKSIZE 0x10000 | 32 | #define MPEG_LOW_WATER_SWAP_CHUNKSIZE 0x10000 |
| 34 | #ifdef HAVE_MMC | 33 | #ifdef HAVE_MMC |
| 35 | #define MPEG_PLAY_PENDING_THRESHOLD 0x20000 | 34 | #define MPEG_PLAY_PENDING_THRESHOLD 0x20000 |
| 36 | #define MPEG_PLAY_PENDING_SWAPSIZE 0x20000 | 35 | #define MPEG_PLAY_PENDING_SWAPSIZE 0x20000 |
| 37 | #else | 36 | #else |
| 38 | #define MPEG_PLAY_PENDING_THRESHOLD 0x10000 | 37 | #define MPEG_PLAY_PENDING_THRESHOLD 0x10000 |
| 39 | #define MPEG_PLAY_PENDING_SWAPSIZE 0x10000 | 38 | #define MPEG_PLAY_PENDING_SWAPSIZE 0x10000 |
| 40 | #endif | 39 | #endif |
| 41 | 40 | ||
| 42 | #define MPEG_MAX_PRERECORD_SECONDS 30 | 41 | #define MPEG_MAX_PRERECORD_SECONDS 30 |