From 6ab1c90513922212788e6abd9c426d6884b64cbe Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Sun, 9 Mar 2008 20:33:19 +0000 Subject: FS#8707 - Enable "Load to RAM" (HAS_TC_RAMCACHE) compilation without Directory Cache (HAS_DIRCACHE). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16594 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 2 +- apps/tagcache.c | 4 ++-- docs/CREDITS | 1 + firmware/export/config.h | 4 +++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apps/playback.c b/apps/playback.c index cb9ed3e162..b36f68f135 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -570,7 +570,7 @@ struct mp3entry* audio_current_track(void) if (!filename) filename = "No file!"; -#ifdef HAVE_TC_RAMCACHE +#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) if (tagcache_fill_tags(&temp_id3, filename)) return &temp_id3; #endif diff --git a/apps/tagcache.c b/apps/tagcache.c index 926ba7b3c7..d7e1fa1cfc 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c @@ -3794,10 +3794,10 @@ static bool load_tagcache(void) # ifdef HAVE_DIRCACHE while (dircache_is_initializing()) sleep(1); + + dircache_set_appflag(DIRCACHE_APPFLAG_TAGCACHE); # endif - dircache_set_appflag(DIRCACHE_APPFLAG_TAGCACHE); - logf("loading tagcache to ram..."); fd = open(TAGCACHE_FILE_MASTER, O_RDONLY); diff --git a/docs/CREDITS b/docs/CREDITS index 1e1a036beb..c4d78edd85 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -379,6 +379,7 @@ Yohann Misquitta Keith Perri Mark Fawcus Ivan Pesic +Marcel Barbulescu The libmad team diff --git a/firmware/export/config.h b/firmware/export/config.h index f7f8bcb98a..208dd36d57 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -308,8 +308,10 @@ /* Enable the directory cache and tagcache in RAM if we have * plenty of RAM. Both features can be enabled independently. */ #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ - !defined(BOOTLOADER) && !defined(SANSA_E200) && !defined(SANSA_C200) + !defined(BOOTLOADER) +#if !defined(SANSA_E200) && !defined(SANSA_C200) #define HAVE_DIRCACHE +#endif #ifdef HAVE_TAGCACHE #define HAVE_TC_RAMCACHE #endif -- cgit v1.2.3