From 19d1cacb1a63c306d842f81127d382512c49a062 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Fri, 31 Oct 2008 21:25:04 +0000 Subject: cleanup storage defines git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657 --- apps/talk.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/talk.c') 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) return NULL; clipbuf = (unsigned char *) p_voicefile + p_voicefile->index[id].offset; -#ifdef HAVE_MMC /* dynamic loading, on demand */ +#if (CONFIG_STORAGE & STORAGE_MMC) /* dynamic loading, on demand */ if (!(clipsize & LOADED_MASK)) { /* clip used for the first time, needs loading */ lseek(filehandle, p_voicefile->index[id].offset, SEEK_SET); @@ -225,7 +225,7 @@ static void load_voicefile(void) if (file_size > audiobufend - audiobuf) /* won't fit? */ goto load_err; -#ifdef HAVE_MMC /* load only the header for now */ +#if (CONFIG_STORAGE & STORAGE_MMC) /* load only the header for now */ load_size = offsetof(struct voicefile, index); #else /* load the full file */ load_size = file_size; @@ -266,7 +266,7 @@ static void load_voicefile(void) structec_convert(&p_voicefile->index[i], "ll", 1, true); #endif -#ifdef HAVE_MMC +#if (CONFIG_STORAGE & STORAGE_MMC) /* load the index table, now that we know its size from the header */ load_size = (p_voicefile->id1_max + p_voicefile->id2_max) * sizeof(struct clip_entry); @@ -520,7 +520,7 @@ void talk_init(void) return; } -#ifdef HAVE_MMC +#if (CONFIG_STORAGE & STORAGE_MMC) if (filehandle >= 0) /* MMC: An old voice file might still be open */ { close(filehandle); @@ -577,7 +577,7 @@ void talk_buffer_steal(void) #if CONFIG_CODEC != SWCODEC mp3_play_stop(); #endif -#ifdef HAVE_MMC +#if (CONFIG_STORAGE & STORAGE_MMC) if (filehandle >= 0) /* only relevant for MMC */ { close(filehandle); -- cgit v1.2.3