summaryrefslogtreecommitdiff
path: root/apps/metadata.c
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2009-08-01 19:52:54 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2009-08-01 19:52:54 +0000
commit1ace06a67d5ec4df3a0295a341124677782baf70 (patch)
tree9ba4ff6fffe72cacda37e4c9e977b1b23f68084c /apps/metadata.c
parentfaf37f9d216c76db1ff8e1ba5aca6c69365bc9c6 (diff)
Metadata parser: make adjust_mp3entry() not depend on id3_is_genre_string(), so there's no need to compare the string to the whole genre array (thanks to Mikael Magnusson)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22105 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata.c')
-rw-r--r--apps/metadata.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/metadata.c b/apps/metadata.c
index b3a4deb385..f227776c0a 100644
--- a/apps/metadata.c
+++ b/apps/metadata.c
@@ -458,7 +458,8 @@ void adjust_mp3entry(struct mp3entry *entry, void *dest, const void *orig)
entry->artist += offset;
if (entry->album)
entry->album += offset;
- if (entry->genre_string && !id3_is_genre_string(entry->genre_string))
+ if (entry->genre_string > (char*)orig
+ && entry->genre_string < (char*)orig + sizeof(struct mp3entry))
/* Don't adjust that if it points to an entry of the "genres" array */
entry->genre_string += offset;
if (entry->track_string)