summaryrefslogtreecommitdiffstats
path: root/apps/metadata/id3tags.c
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-15 20:10:50 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-02-15 20:10:50 +0000
commite3abdb1a52a2e9ae7469a6ce1b0e5900ac58d89b (patch)
tree24659c17ed31eac362056253392c960898540899 /apps/metadata/id3tags.c
parent237ca504e12c06a5cfa7cd0fb9d9c672dc588f1c (diff)
downloadrockbox-e3abdb1a52a2e9ae7469a6ce1b0e5900ac58d89b.tar.gz
rockbox-e3abdb1a52a2e9ae7469a6ce1b0e5900ac58d89b.tar.bz2
rockbox-e3abdb1a52a2e9ae7469a6ce1b0e5900ac58d89b.zip
Undo unwanted commit r29310.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29311 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata/id3tags.c')
-rw-r--r--apps/metadata/id3tags.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/metadata/id3tags.c b/apps/metadata/id3tags.c
index 9143f8ad25..9ee183a1b3 100644
--- a/apps/metadata/id3tags.c
+++ b/apps/metadata/id3tags.c
@@ -358,7 +358,8 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
if ((tag - entry->id3v2buf + desc_len + 2) < bufferpos) {
/* At least part of the value was read, so we can safely try to
- * parse it */
+ * parse it
+ */
value = tag + desc_len + 1;
value_len = bufferpos - (tag - entry->id3v2buf);
@@ -367,7 +368,8 @@ static int parseuser( struct mp3entry* entry, char* tag, int bufferpos )
entry->albumartist = tag;
#if CONFIG_CODEC == SWCODEC
} else {
- value_len = parse_replaygain(tag, value, entry, tag, value_len);
+ value_len = parse_replaygain(tag, value, entry, tag,
+ value_len);
#endif
}
}
@@ -1038,12 +1040,6 @@ void setid3v2title(int fd, struct mp3entry *entry)
#endif
if( tr->ppFunc )
bufferpos = tr->ppFunc(entry, tag, bufferpos);
-
- /* Trim. Take into account that multiple string contents will
- * only be displayed up to their first null termination. All
- * content after this null termination is obsolete and can be
- * overwritten. */
- bufferpos -= (bytesread - strlen(tag));
/* Seek to the next frame */
if(framelen < totframelen)