diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-10-31 21:25:04 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-10-31 21:25:04 +0000 |
commit | 19d1cacb1a63c306d842f81127d382512c49a062 (patch) | |
tree | bac051d18aae2c9f201744890177e0021e5269be /apps/talk.c | |
parent | 3aa58328080ab9a254d9f2329696fa4309a30d50 (diff) | |
download | rockbox-19d1cacb1a63c306d842f81127d382512c49a062.tar.gz rockbox-19d1cacb1a63c306d842f81127d382512c49a062.zip |
cleanup storage defines
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/talk.c')
-rw-r--r-- | apps/talk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/talk.c b/apps/talk.c index 2da4cd5c26..44ba063655 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -187,7 +187,7 @@ static unsigned char* get_clip(long id, long* p_size) | |||
187 | return NULL; | 187 | return NULL; |
188 | clipbuf = (unsigned char *) p_voicefile + p_voicefile->index[id].offset; | 188 | clipbuf = (unsigned char *) p_voicefile + p_voicefile->index[id].offset; |
189 | 189 | ||
190 | #ifdef HAVE_MMC /* dynamic loading, on demand */ | 190 | #if (CONFIG_STORAGE & STORAGE_MMC) /* dynamic loading, on demand */ |
191 | if (!(clipsize & LOADED_MASK)) | 191 | if (!(clipsize & LOADED_MASK)) |
192 | { /* clip used for the first time, needs loading */ | 192 | { /* clip used for the first time, needs loading */ |
193 | lseek(filehandle, p_voicefile->index[id].offset, SEEK_SET); | 193 | lseek(filehandle, p_voicefile->index[id].offset, SEEK_SET); |
@@ -225,7 +225,7 @@ static void load_voicefile(void) | |||
225 | if (file_size > audiobufend - audiobuf) /* won't fit? */ | 225 | if (file_size > audiobufend - audiobuf) /* won't fit? */ |
226 | goto load_err; | 226 | goto load_err; |
227 | 227 | ||
228 | #ifdef HAVE_MMC /* load only the header for now */ | 228 | #if (CONFIG_STORAGE & STORAGE_MMC) /* load only the header for now */ |
229 | load_size = offsetof(struct voicefile, index); | 229 | load_size = offsetof(struct voicefile, index); |
230 | #else /* load the full file */ | 230 | #else /* load the full file */ |
231 | load_size = file_size; | 231 | load_size = file_size; |
@@ -266,7 +266,7 @@ static void load_voicefile(void) | |||
266 | structec_convert(&p_voicefile->index[i], "ll", 1, true); | 266 | structec_convert(&p_voicefile->index[i], "ll", 1, true); |
267 | #endif | 267 | #endif |
268 | 268 | ||
269 | #ifdef HAVE_MMC | 269 | #if (CONFIG_STORAGE & STORAGE_MMC) |
270 | /* load the index table, now that we know its size from the header */ | 270 | /* load the index table, now that we know its size from the header */ |
271 | load_size = (p_voicefile->id1_max + p_voicefile->id2_max) | 271 | load_size = (p_voicefile->id1_max + p_voicefile->id2_max) |
272 | * sizeof(struct clip_entry); | 272 | * sizeof(struct clip_entry); |
@@ -520,7 +520,7 @@ void talk_init(void) | |||
520 | return; | 520 | return; |
521 | } | 521 | } |
522 | 522 | ||
523 | #ifdef HAVE_MMC | 523 | #if (CONFIG_STORAGE & STORAGE_MMC) |
524 | if (filehandle >= 0) /* MMC: An old voice file might still be open */ | 524 | if (filehandle >= 0) /* MMC: An old voice file might still be open */ |
525 | { | 525 | { |
526 | close(filehandle); | 526 | close(filehandle); |
@@ -577,7 +577,7 @@ void talk_buffer_steal(void) | |||
577 | #if CONFIG_CODEC != SWCODEC | 577 | #if CONFIG_CODEC != SWCODEC |
578 | mp3_play_stop(); | 578 | mp3_play_stop(); |
579 | #endif | 579 | #endif |
580 | #ifdef HAVE_MMC | 580 | #if (CONFIG_STORAGE & STORAGE_MMC) |
581 | if (filehandle >= 0) /* only relevant for MMC */ | 581 | if (filehandle >= 0) /* only relevant for MMC */ |
582 | { | 582 | { |
583 | close(filehandle); | 583 | close(filehandle); |