summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-07-25 10:37:51 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-07-25 10:37:51 +0000
commit5dfc343a245c3f48767fe463efdb703381396d3a (patch)
tree0e9498567880ad68c9f5391c33f8bac23b38f2c0
parent62d666df6f0e35b0619a7c0c04ec61609709e41a (diff)
downloadrockbox-5dfc343a245c3f48767fe463efdb703381396d3a.tar.gz
rockbox-5dfc343a245c3f48767fe463efdb703381396d3a.tar.bz2
rockbox-5dfc343a245c3f48767fe463efdb703381396d3a.zip
Submit FS#12196. Adds support for embedded album art (jpg) with APEv2 tags.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30210 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/metadata/ape.c44
-rw-r--r--manual/appendix/file_formats.tex2
2 files changed, 45 insertions, 1 deletions
diff --git a/apps/metadata/ape.c b/apps/metadata/ape.c
index 44fc69a45a..eb534a498f 100644
--- a/apps/metadata/ape.c
+++ b/apps/metadata/ape.c
@@ -35,6 +35,13 @@
#define APETAG_ITEM_HEADER_FORMAT "ll"
#define APETAG_ITEM_TYPE_MASK 3
+#ifdef HAVE_ALBUMART
+/* The AA header consists of the pseudo filename "Album Cover (Front).ext"
+ * whereas ".ext" is the file extension. For now ".jpg" and ".png" are
+ * supported by this APE metadata parser. Therefore the length is 22. */
+#define APETAG_AA_HEADER_LENGTH 22
+#endif
+
struct apetag_header
{
char id[8];
@@ -125,6 +132,43 @@ bool read_ape_tags(int fd, struct mp3entry* id3)
}
else
{
+#ifdef HAVE_ALBUMART
+ if (strcasecmp(name, "cover art (front)") == 0)
+ {
+ /* Allow to read at least APETAG_AA_HEADER_LENGTH bytes. */
+ r = read_string(fd, name, sizeof(name), 0, APETAG_AA_HEADER_LENGTH);
+ if (r == -1)
+ {
+ return false;
+ }
+
+ /* Gather the album art format from the pseudo file name. */
+ id3->albumart.type = AA_TYPE_UNKNOWN;
+ if (strcasecmp(name, "cover art (front).jpg") == 0)
+ {
+ id3->albumart.type = AA_TYPE_JPG;
+ }
+ else if (strcasecmp(name, "cover art (front).png") == 0)
+ {
+ id3->albumart.type = AA_TYPE_PNG;
+ }
+
+ /* Set the album art size and position. */
+ if (id3->albumart.type != AA_TYPE_UNKNOWN)
+ {
+ id3->albumart.pos = lseek(fd, 0, SEEK_CUR);
+ id3->albumart.size = item.length - r;
+ id3->embed_albumart = true;
+ }
+
+ /* Seek back to this APE items begin. */
+ if (lseek(fd, -r, SEEK_CUR) < 0)
+ {
+ return false;
+ }
+ }
+#endif
+ /* Seek to the next APE item. */
if (lseek(fd, item.length, SEEK_CUR) < 0)
{
return false;
diff --git a/manual/appendix/file_formats.tex b/manual/appendix/file_formats.tex
index ec99ffa9ba..696c0d62d9 100644
--- a/manual/appendix/file_formats.tex
+++ b/manual/appendix/file_formats.tex
@@ -295,7 +295,7 @@
{\textbf{Feature} & \textbf{ID3} & \textbf{APE} & \textbf{Vorbis} &
\textbf{MP4} & \textbf{ASF}}{}{}
Embedded albumart \fname{.bmp} & & & & & \\
- Embedded albumart \fname{.jpg} & x & & & x & \\
+ Embedded albumart \fname{.jpg} & x & x & & x & \\
Embedded albumart \fname{.png} & & & & & \\
Replaygain information & x & x & x & x & x \\
Title (string) & x & x & x & x & x \\