diff options
author | Miika Pekkarinen <miipekk@ihme.org> | 2008-03-09 20:33:19 +0000 |
---|---|---|
committer | Miika Pekkarinen <miipekk@ihme.org> | 2008-03-09 20:33:19 +0000 |
commit | 6ab1c90513922212788e6abd9c426d6884b64cbe (patch) | |
tree | abba09e88a45ad6a97d7fac8c4282b7295fb9076 | |
parent | 7317139eb487ce3a59f0895c8edcfb1a2c8109f7 (diff) | |
download | rockbox-6ab1c90513922212788e6abd9c426d6884b64cbe.tar.gz rockbox-6ab1c90513922212788e6abd9c426d6884b64cbe.zip |
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
-rw-r--r-- | apps/playback.c | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 4 | ||||
-rw-r--r-- | docs/CREDITS | 1 | ||||
-rw-r--r-- | 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) | |||
570 | if (!filename) | 570 | if (!filename) |
571 | filename = "No file!"; | 571 | filename = "No file!"; |
572 | 572 | ||
573 | #ifdef HAVE_TC_RAMCACHE | 573 | #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) |
574 | if (tagcache_fill_tags(&temp_id3, filename)) | 574 | if (tagcache_fill_tags(&temp_id3, filename)) |
575 | return &temp_id3; | 575 | return &temp_id3; |
576 | #endif | 576 | #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) | |||
3794 | # ifdef HAVE_DIRCACHE | 3794 | # ifdef HAVE_DIRCACHE |
3795 | while (dircache_is_initializing()) | 3795 | while (dircache_is_initializing()) |
3796 | sleep(1); | 3796 | sleep(1); |
3797 | |||
3798 | dircache_set_appflag(DIRCACHE_APPFLAG_TAGCACHE); | ||
3797 | # endif | 3799 | # endif |
3798 | 3800 | ||
3799 | dircache_set_appflag(DIRCACHE_APPFLAG_TAGCACHE); | ||
3800 | |||
3801 | logf("loading tagcache to ram..."); | 3801 | logf("loading tagcache to ram..."); |
3802 | 3802 | ||
3803 | fd = open(TAGCACHE_FILE_MASTER, O_RDONLY); | 3803 | 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 | |||
379 | Keith Perri | 379 | Keith Perri |
380 | Mark Fawcus | 380 | Mark Fawcus |
381 | Ivan Pesic | 381 | Ivan Pesic |
382 | Marcel Barbulescu | ||
382 | 383 | ||
383 | 384 | ||
384 | The libmad team | 385 | 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 @@ | |||
308 | /* Enable the directory cache and tagcache in RAM if we have | 308 | /* Enable the directory cache and tagcache in RAM if we have |
309 | * plenty of RAM. Both features can be enabled independently. */ | 309 | * plenty of RAM. Both features can be enabled independently. */ |
310 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ | 310 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ |
311 | !defined(BOOTLOADER) && !defined(SANSA_E200) && !defined(SANSA_C200) | 311 | !defined(BOOTLOADER) |
312 | #if !defined(SANSA_E200) && !defined(SANSA_C200) | ||
312 | #define HAVE_DIRCACHE | 313 | #define HAVE_DIRCACHE |
314 | #endif | ||
313 | #ifdef HAVE_TAGCACHE | 315 | #ifdef HAVE_TAGCACHE |
314 | #define HAVE_TC_RAMCACHE | 316 | #define HAVE_TC_RAMCACHE |
315 | #endif | 317 | #endif |