From f51189cd5e11cec965b23fc9c48bcbbd214bcaa6 Mon Sep 17 00:00:00 2001 From: Andrew Mahone Date: Thu, 28 May 2009 04:34:07 +0000 Subject: [PATCH] Suggested by Thomas Martitz, don't check for track-specific files when searching for covers in PictureFlow. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21111 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pictureflow/pictureflow.c | 2 +- apps/recorder/albumart.c | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 2baea2a730..218f0a9574 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c @@ -892,7 +892,7 @@ bool get_albumart_for_index_from_db(const int slide_index, char *buf, rb->get_metadata(&id3, fd, tcs.result); rb->close(fd); } - if ( search_albumart_files(&id3, "", buf, buflen) ) + if ( search_albumart_files(&id3, ":", buf, buflen) ) result = true; else result = false; diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c index e052906037..d0026b638c 100644 --- a/apps/recorder/albumart.c +++ b/apps/recorder/albumart.c @@ -156,13 +156,17 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string, albumlen = id3->album ? strlen(id3->album) : 0; /* the first file we look for is one specific to the track playing */ - strip_extension(path, sizeof(path) - strlen(size_string) - 4, trackname); - strcat(path, size_string); - strcat(path, "." EXT); -#ifdef USE_JPEG_COVER - pathlen = strlen(path); -#endif - found = try_exts(path, pathlen); + if (*size_string == ':') + size_string++; + else { + strip_extension(path, sizeof(path) - strlen(size_string) - 4, trackname); + strcat(path, size_string); + strcat(path, "." EXT); + #ifdef USE_JPEG_COVER + pathlen = strlen(path); + #endif + found = try_exts(path, pathlen); + } if (!found && albumlen > 0) { /* if it doesn't exist,