diff options
-rw-r--r-- | apps/metadata.c | 3 | ||||
-rw-r--r-- | apps/metadata/metadata_parsers.h | 1 | ||||
-rw-r--r-- | apps/metadata/mp3.c | 12 |
3 files changed, 2 insertions, 14 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) | |||
458 | entry->artist += offset; | 458 | entry->artist += offset; |
459 | if (entry->album) | 459 | if (entry->album) |
460 | entry->album += offset; | 460 | entry->album += offset; |
461 | if (entry->genre_string && !id3_is_genre_string(entry->genre_string)) | 461 | if (entry->genre_string > (char*)orig |
462 | && entry->genre_string < (char*)orig + sizeof(struct mp3entry)) | ||
462 | /* Don't adjust that if it points to an entry of the "genres" array */ | 463 | /* Don't adjust that if it points to an entry of the "genres" array */ |
463 | entry->genre_string += offset; | 464 | entry->genre_string += offset; |
464 | if (entry->track_string) | 465 | if (entry->track_string) |
diff --git a/apps/metadata/metadata_parsers.h b/apps/metadata/metadata_parsers.h index 760d9a0da3..0464071777 100644 --- a/apps/metadata/metadata_parsers.h +++ b/apps/metadata/metadata_parsers.h | |||
@@ -20,7 +20,6 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | char* id3_get_num_genre(unsigned int genre_num); | 22 | char* id3_get_num_genre(unsigned int genre_num); |
23 | bool id3_is_genre_string(const char *string); | ||
24 | int getid3v2len(int fd); | 23 | int getid3v2len(int fd); |
25 | bool get_mp3_metadata(int fd, struct mp3entry* id3, const char *filename); | 24 | bool get_mp3_metadata(int fd, struct mp3entry* id3, const char *filename); |
26 | 25 | ||
diff --git a/apps/metadata/mp3.c b/apps/metadata/mp3.c index 20596b1961..21cdeff3fc 100644 --- a/apps/metadata/mp3.c +++ b/apps/metadata/mp3.c | |||
@@ -94,18 +94,6 @@ char* id3_get_num_genre(unsigned int genre_num) | |||
94 | return NULL; | 94 | return NULL; |
95 | } | 95 | } |
96 | 96 | ||
97 | /* True if the string is from the "genres" array */ | ||
98 | bool id3_is_genre_string(const char *string) | ||
99 | { | ||
100 | unsigned int i; | ||
101 | |||
102 | for(i=0; i < ARRAYLEN(genres); i++) | ||
103 | if(genres[i] == string) | ||
104 | return true; | ||
105 | |||
106 | return false; | ||
107 | } | ||
108 | |||
109 | /* | 97 | /* |
110 | HOW TO ADD ADDITIONAL ID3 VERSION 2 TAGS | 98 | HOW TO ADD ADDITIONAL ID3 VERSION 2 TAGS |
111 | Code and comments by Thomas Paul Diffenbach | 99 | Code and comments by Thomas Paul Diffenbach |