diff options
author | Robert Keevil <rkeevil+rockbox@gmail.com> | 2008-10-07 18:39:44 +0000 |
---|---|---|
committer | Robert Keevil <rkeevil+rockbox@gmail.com> | 2008-10-07 18:39:44 +0000 |
commit | 2c170356f38f5630b9fefdc5b1e7e57babb5cc40 (patch) | |
tree | 9ba565416427f76e6cf4754ef199ed02f804edf6 /apps/metadata | |
parent | 7eb194477a19a12d76bceb64108ffad2da784c9f (diff) | |
download | rockbox-2c170356f38f5630b9fefdc5b1e7e57babb5cc40.tar.gz rockbox-2c170356f38f5630b9fefdc5b1e7e57babb5cc40.zip |
FS#9139 - support for ver 1.1 scrobbler log files. Upload any old files first - uploading software may need updating, see the LastFMLog wiki page
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18732 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/metadata')
-rw-r--r-- | apps/metadata/asf.c | 3 | ||||
-rw-r--r-- | apps/metadata/metadata_common.c | 5 | ||||
-rw-r--r-- | apps/metadata/mp4.c | 5 |
3 files changed, 13 insertions, 0 deletions
diff --git a/apps/metadata/asf.c b/apps/metadata/asf.c index fa1308b560..255a0bcba4 100644 --- a/apps/metadata/asf.c +++ b/apps/metadata/asf.c | |||
@@ -465,6 +465,9 @@ static int asf_parse_header(int fd, struct mp3entry* id3, | |||
465 | id3buf = value; | 465 | id3buf = value; |
466 | id3buf_remaining = buf_len; | 466 | id3buf_remaining = buf_len; |
467 | } | 467 | } |
468 | } else if (!strcmp("MusicBrainz/Track Id", utf8buf)) { | ||
469 | id3->mb_track_id = id3buf; | ||
470 | asf_utf16LEdecode(fd, length, &id3buf, &id3buf_remaining); | ||
468 | } else { | 471 | } else { |
469 | lseek(fd, length, SEEK_CUR); | 472 | lseek(fd, length, SEEK_CUR); |
470 | } | 473 | } |
diff --git a/apps/metadata/metadata_common.c b/apps/metadata/metadata_common.c index 1fff030e57..e4df874cff 100644 --- a/apps/metadata/metadata_common.c +++ b/apps/metadata/metadata_common.c | |||
@@ -293,6 +293,11 @@ long parse_tag(const char* name, char* value, struct mp3entry* id3, | |||
293 | { | 293 | { |
294 | p = &(id3->grouping); | 294 | p = &(id3->grouping); |
295 | } | 295 | } |
296 | else if (strcasecmp(name, "musicbrainz_trackid") == 0 | ||
297 | || strcasecmp(name, "http://musicbrainz.org") == 0 ) | ||
298 | { | ||
299 | p = &(id3->mb_track_id); | ||
300 | } | ||
296 | else | 301 | else |
297 | { | 302 | { |
298 | len = parse_replaygain(name, value, id3, buf, buf_remaining); | 303 | len = parse_replaygain(name, value, id3, buf, buf_remaining); |
diff --git a/apps/metadata/mp4.c b/apps/metadata/mp4.c index 187459b7fb..493bc48da7 100644 --- a/apps/metadata/mp4.c +++ b/apps/metadata/mp4.c | |||
@@ -498,6 +498,11 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3, | |||
498 | DEBUGF("AAC: lead_trim %d, tail_trim %d\n", | 498 | DEBUGF("AAC: lead_trim %d, tail_trim %d\n", |
499 | id3->lead_trim, id3->tail_trim); | 499 | id3->lead_trim, id3->tail_trim); |
500 | } | 500 | } |
501 | else if (strcasecmp(tag_name, "musicbrainz track id") == 0) | ||
502 | { | ||
503 | read_mp4_tag_string(fd, size, &buffer, &buffer_left, | ||
504 | &id3->mb_track_id); | ||
505 | } | ||
501 | else | 506 | else |
502 | { | 507 | { |
503 | char* any; | 508 | char* any; |