diff options
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 2 | ||||
-rw-r--r-- | apps/plugin.c | 2 | ||||
-rw-r--r-- | apps/plugin.h | 2 | ||||
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 2 | ||||
-rw-r--r-- | apps/tagcache.h | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index 19a5ba5979..11200e448c 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -537,7 +537,7 @@ static struct mp3entry* get_mp3entry_from_offset(int offset, char **filename) | |||
537 | fname = playlist_peek(offset, filename_buf, sizeof(filename_buf)); | 537 | fname = playlist_peek(offset, filename_buf, sizeof(filename_buf)); |
538 | *filename = (char*)fname; | 538 | *filename = (char*)fname; |
539 | #if CONFIG_CODEC == SWCODEC | 539 | #if CONFIG_CODEC == SWCODEC |
540 | #ifdef HAVE_TC_RAMCACHE | 540 | #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) |
541 | static struct mp3entry tempid3; | 541 | static struct mp3entry tempid3; |
542 | if (tagcache_fill_tags(&tempid3, fname)) | 542 | if (tagcache_fill_tags(&tempid3, fname)) |
543 | { | 543 | { |
diff --git a/apps/plugin.c b/apps/plugin.c index 193d02e034..28c5854798 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -703,7 +703,7 @@ static const struct plugin_api rockbox_api = { | |||
703 | tagcache_retrieve, | 703 | tagcache_retrieve, |
704 | tagcache_search_finish, | 704 | tagcache_search_finish, |
705 | tagcache_get_numeric, | 705 | tagcache_get_numeric, |
706 | #ifdef HAVE_TC_RAMCACHE | 706 | #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) |
707 | tagcache_fill_tags, | 707 | tagcache_fill_tags, |
708 | #endif | 708 | #endif |
709 | #endif | 709 | #endif |
diff --git a/apps/plugin.h b/apps/plugin.h index 0b3a5b566f..cbfc48bd08 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -874,7 +874,7 @@ struct plugin_api { | |||
874 | int tag, char *buf, long size); | 874 | int tag, char *buf, long size); |
875 | void (*tagcache_search_finish)(struct tagcache_search *tcs); | 875 | void (*tagcache_search_finish)(struct tagcache_search *tcs); |
876 | long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag); | 876 | long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag); |
877 | #ifdef HAVE_TC_RAMCACHE | 877 | #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) |
878 | bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename); | 878 | bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename); |
879 | #endif | 879 | #endif |
880 | #endif | 880 | #endif |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 8ad62b0238..7627ff4a53 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -948,7 +948,7 @@ bool get_albumart_for_index_from_db(const int slide_index, char *buf, | |||
948 | struct mp3entry id3; | 948 | struct mp3entry id3; |
949 | int fd; | 949 | int fd; |
950 | 950 | ||
951 | #ifdef HAVE_TC_RAMCACHE | 951 | #if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) |
952 | if (rb->tagcache_fill_tags(&id3, tcs.result)) | 952 | if (rb->tagcache_fill_tags(&id3, tcs.result)) |
953 | { | 953 | { |
954 | rb->strlcpy(id3.path, tcs.result, sizeof(id3.path)); | 954 | rb->strlcpy(id3.path, tcs.result, sizeof(id3.path)); |
diff --git a/apps/tagcache.h b/apps/tagcache.h index 15b4251ddc..b52da76a0f 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h | |||
@@ -239,7 +239,9 @@ void tagcache_screensync_enable(bool state); | |||
239 | 239 | ||
240 | #ifdef HAVE_TC_RAMCACHE | 240 | #ifdef HAVE_TC_RAMCACHE |
241 | bool tagcache_is_ramcache(void); | 241 | bool tagcache_is_ramcache(void); |
242 | #ifdef HAVE_DIRCACHE | ||
242 | bool tagcache_fill_tags(struct mp3entry *id3, const char *filename); | 243 | bool tagcache_fill_tags(struct mp3entry *id3, const char *filename); |
244 | #endif | ||
243 | void tagcache_unload_ramcache(void); | 245 | void tagcache_unload_ramcache(void); |
244 | #endif | 246 | #endif |
245 | void tagcache_init(void) INIT_ATTR; | 247 | void tagcache_init(void) INIT_ATTR; |