diff options
| author | Teruaki Kawashima <teru@rockbox.org> | 2010-09-30 13:09:50 +0000 |
|---|---|---|
| committer | Teruaki Kawashima <teru@rockbox.org> | 2010-09-30 13:09:50 +0000 |
| commit | 55a63609ef1bf24c3594eeb2f6eca92cba81bae5 (patch) | |
| tree | 4636c15a93666b0f10087c6685582cc8af12b597 | |
| parent | 2dbe569aff3d7f5cab3efff30b6467e02560df91 (diff) | |
| download | rockbox-55a63609ef1bf24c3594eeb2f6eca92cba81bae5.zip rockbox-55a63609ef1bf24c3594eeb2f6eca92cba81bae5.tar.gz rockbox-55a63609ef1bf24c3594eeb2f6eca92cba81bae5.tar.bz2 rockbox-55a63609ef1bf24c3594eeb2f6eca92cba81bae5.tar.xz | |
use correct condition for #if for tagcache_fill_tags().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28188 a1c6a512-1295-4272-9138-f99709370657
| -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 19a5ba5..11200e4 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) fname = playlist_peek(offset, filename_buf, sizeof(filename_buf)); *filename = (char*)fname; #if CONFIG_CODEC == SWCODEC -#ifdef HAVE_TC_RAMCACHE +#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) static struct mp3entry tempid3; if (tagcache_fill_tags(&tempid3, fname)) { diff --git a/apps/plugin.c b/apps/plugin.c index 193d02e..28c5854 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -703,7 +703,7 @@ static const struct plugin_api rockbox_api = { tagcache_retrieve, tagcache_search_finish, tagcache_get_numeric, -#ifdef HAVE_TC_RAMCACHE +#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) tagcache_fill_tags, #endif #endif diff --git a/apps/plugin.h b/apps/plugin.h index 0b3a5b5..cbfc48b 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -874,7 +874,7 @@ struct plugin_api { int tag, char *buf, long size); void (*tagcache_search_finish)(struct tagcache_search *tcs); long (*tagcache_get_numeric)(const struct tagcache_search *tcs, int tag); -#ifdef HAVE_TC_RAMCACHE +#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) bool (*tagcache_fill_tags)(struct mp3entry *id3, const char *filename); #endif #endif diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 8ad62b0..7627ff4 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, struct mp3entry id3; int fd; -#ifdef HAVE_TC_RAMCACHE +#if defined(HAVE_TC_RAMCACHE) && defined(HAVE_DIRCACHE) if (rb->tagcache_fill_tags(&id3, tcs.result)) { rb->strlcpy(id3.path, tcs.result, sizeof(id3.path)); diff --git a/apps/tagcache.h b/apps/tagcache.h index 15b4251..b52da76 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h @@ -239,7 +239,9 @@ void tagcache_screensync_enable(bool state); #ifdef HAVE_TC_RAMCACHE bool tagcache_is_ramcache(void); +#ifdef HAVE_DIRCACHE bool tagcache_fill_tags(struct mp3entry *id3, const char *filename); +#endif void tagcache_unload_ramcache(void); #endif void tagcache_init(void) INIT_ATTR; |