Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 |
diff --git a/apps/recorder/albumart.c b/apps/recorder/albumart.c index d0026b6..9724c46 100644 @@ -137,6 +137,8 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string, char path[MAX_PATH + 1]; char dir[MAX_PATH + 1]; bool found = false; + int track_first = 1; + int pass; const char *trackname; const char *artist; int dirlen; @@ -151,93 +153,105 @@ bool search_albumart_files(const struct mp3entry *id3, const char *size_string, if (strcmp(trackname, "No file!") == 0) return false; - strip_filename(dir, sizeof(dir), trackname); - dirlen = strlen(dir); - albumlen = id3->album ? strlen(id3->album) : 0; - - /* the first file we look for is one specific to the track playing */ 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, - * we look for a file specific to the track's album name */ - pathlen = snprintf(path, sizeof(path), - "%s%s%s." EXT, dir, id3->album, size_string); - fix_path_part(path, dirlen, albumlen); - found = try_exts(path, pathlen); + size_string++; + track_first = 0; } - if (!found) - { - /* if it still doesn't exist, we look for a generic file */ - pathlen = snprintf(path, sizeof(path), - "%scover%s." EXT, dir, size_string); - found = try_exts(path, pathlen); - } + strip_filename(dir, sizeof(dir), trackname); + dirlen = strlen(dir); + albumlen = id3->album ? strlen(id3->album) : 0; -#ifdef USE_JPEG_COVER - if (!found && !*size_string) + for(pass = 0; pass < 2; pass++) { - snprintf (path, sizeof(path), "%sfolder.jpg", dir); - found = file_exists(path); - } + if (track_first || pass) + { + /* the first file we look for is one specific to the + current track */ + 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 - - artist = id3->albumartist != NULL ? id3->albumartist : id3->artist; - - if (!found && artist && id3->album) - { - /* look in the albumart subdir of .rockbox */ - pathlen = snprintf(path, sizeof(path), - ROCKBOX_DIR "/albumart/%s-%s%s." EXT, - artist, - id3->album, - size_string); - fix_path_part(path, strlen(ROCKBOX_DIR "/albumart/"), MAX_PATH); - found = try_exts(path, pathlen); - } - - if (!found) - { - /* if it still doesn't exist, - * we continue to search in the parent directory */ - strcpy(path, dir); - path[dirlen - 1] = 0; - strip_filename(dir, sizeof(dir), path); - dirlen = strlen(dir); - } - - /* only try parent if there is one */ - if (dirlen > 0) - { + found = try_exts(path, pathlen); + } + if (pass) + break; if (!found && albumlen > 0) { - /* we look in the parent directory - * for a file specific to the track's album name */ + /* if it doesn't exist, + * we look for a file specific to the track's album name */ pathlen = snprintf(path, sizeof(path), - "%s%s%s." EXT, dir, id3->album, size_string); + "%s%s%s." EXT, dir, id3->album, size_string); fix_path_part(path, dirlen, albumlen); found = try_exts(path, pathlen); } - + if (!found) { - /* if it still doesn't exist, we look in the parent directory - * for a generic file */ + /* if it still doesn't exist, we look for a generic file */ + pathlen = snprintf(path, sizeof(path), + "%scover%s." EXT, dir, size_string); + found = try_exts(path, pathlen); + } + +#ifdef USE_JPEG_COVER + if (!found && !*size_string) + { + snprintf (path, sizeof(path), "%sfolder.jpg", dir); + found = file_exists(path); + } +#endif + + artist = id3->albumartist != NULL ? id3->albumartist : id3->artist; + + if (!found && artist && id3->album) + { + /* look in the albumart subdir of .rockbox */ pathlen = snprintf(path, sizeof(path), - "%scover%s." EXT, dir, size_string); + ROCKBOX_DIR "/albumart/%s-%s%s." EXT, + artist, + id3->album, + size_string); + fix_path_part(path, strlen(ROCKBOX_DIR "/albumart/"), MAX_PATH); found = try_exts(path, pathlen); } + + if (!found) + { + /* if it still doesn't exist, + * we continue to search in the parent directory */ + strcpy(path, dir); + path[dirlen - 1] = 0; + strip_filename(dir, sizeof(dir), path); + dirlen = strlen(dir); + } + + /* only try parent if there is one */ + if (dirlen > 0) + { + if (!found && albumlen > 0) + { + /* we look in the parent directory + * for a file specific to the track's album name */ + pathlen = snprintf(path, sizeof(path), + "%s%s%s." EXT, dir, id3->album, size_string); + fix_path_part(path, dirlen, albumlen); + found = try_exts(path, pathlen); + } + + if (!found) + { + /* if it still doesn't exist, we look in the parent directory + * for a generic file */ + pathlen = snprintf(path, sizeof(path), + "%scover%s." EXT, dir, size_string); + found = try_exts(path, pathlen); + } + } } if (!found) |
