Index: apps/metadata.c =================================================================== RCS file: /cvsroot/rockbox/apps/metadata.c,v retrieving revision 1.55 diff -u -r1.55 metadata.c --- apps/metadata.c 29 Oct 2006 22:18:30 -0000 1.55 +++ apps/metadata.c 30 Oct 2006 22:23:23 -0000 @@ -336,6 +336,10 @@ { p = &(id3->composer); } + else if (strcasecmp(name, "comment") == 0) + { + p = &(id3->comment); + } else { len = parse_replaygain(name, value, id3, buf, buf_remaining); Index: apps/tagcache.c =================================================================== RCS file: /cvsroot/rockbox/apps/tagcache.c,v retrieving revision 1.75 diff -u -r1.75 tagcache.c --- apps/tagcache.c 24 Oct 2006 17:39:06 -0000 1.75 +++ apps/tagcache.c 30 Oct 2006 21:50:09 -0000 @@ -91,17 +91,17 @@ static long tempbuf_pos; /* Tags we want to get sorted (loaded to the tempbuf). */ -static const int sorted_tags[] = { tag_artist, tag_album, tag_genre, tag_composer, tag_title }; +static const int sorted_tags[] = { tag_artist, tag_album, tag_genre, tag_composer, tag_comment, tag_title }; /* Uniqued tags (we can use these tags with filters and conditional clauses). */ -static const int unique_tags[] = { tag_artist, tag_album, tag_genre, tag_composer }; +static const int unique_tags[] = { tag_artist, tag_album, tag_genre, tag_composer, tag_comment }; /* Numeric tags (we can use these tags with conditional clauses). */ static const int numeric_tags[] = { tag_year, tag_tracknumber, tag_length, tag_bitrate, - tag_playcount, tag_playtime, tag_lastplayed, tag_virt_autoscore }; + tag_playcount, tag_playtime, tag_lastplayed, tag_virt_autoscore, tag_virt_relplay }; static const char *tags_str[] = { "artist", "album", "genre", "title", - "filename", "composer", "year", "tracknumber", "bitrate", "length", + "filename", "composer", "comment", "year", "tracknumber", "bitrate", "length", "playcount", "playtime", "lastplayed" }; /* Status information of the tagcache. */ @@ -635,6 +635,7 @@ switch (tag) { + case tag_virt_relplay: case tag_virt_autoscore: if (idx->tag_seek[tag_length] == 0 || idx->tag_seek[tag_playcount] == 0) @@ -644,8 +645,10 @@ else { data = 100 * idx->tag_seek[tag_playtime] - / idx->tag_seek[tag_length] - / idx->tag_seek[tag_playcount]; + / idx->tag_seek[tag_length]; + + if(tag == tag_virt_autoscore) + data /= idx->tag_seek[tag_playcount]; } break; @@ -1382,6 +1385,7 @@ id3->album = get_tag(entry, tag_album)->tag_data; id3->genre_string = get_tag(entry, tag_genre)->tag_data; id3->composer = get_tag(entry, tag_composer)->tag_data; + id3->comment = get_tag(entry, tag_comment)->tag_data; id3->year = get_tag_numeric(entry, tag_year); id3->tracknum = get_tag_numeric(entry, tag_tracknumber); id3->bitrate = get_tag_numeric(entry, tag_bitrate); @@ -1530,6 +1534,7 @@ ADD_TAG(entry, tag_album, &track.id3.album); ADD_TAG(entry, tag_genre, &genrestr); ADD_TAG(entry, tag_composer, &track.id3.composer); + ADD_TAG(entry, tag_comment, &track.id3.comment); entry.data_length = offset; /* Write the header */ @@ -1542,6 +1547,7 @@ write_item(track.id3.album); write_item(genrestr); write_item(track.id3.composer); + write_item(track.id3.comment); total_entry_count++; } Index: apps/tagcache.h =================================================================== RCS file: /cvsroot/rockbox/apps/tagcache.h,v retrieving revision 1.29 diff -u -r1.29 tagcache.h --- apps/tagcache.h 25 Oct 2006 15:14:15 -0000 1.29 +++ apps/tagcache.h 30 Oct 2006 21:50:09 -0000 @@ -23,12 +23,12 @@ #include "id3.h" enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title, - tag_filename, tag_composer, tag_year, tag_tracknumber, + tag_filename, tag_composer, tag_comment, tag_year, tag_tracknumber, tag_bitrate, tag_length, tag_playcount, tag_playtime, tag_lastplayed, /* Virtual tags */ - tag_virt_autoscore }; + tag_virt_autoscore, tag_virt_relplay }; -#define TAG_COUNT 13 +#define TAG_COUNT 14 /* Allow a little drift to the filename ordering (should not be too high/low). */ #define POS_HISTORY_COUNT 4 @@ -37,7 +37,7 @@ #define IDX_BUF_DEPTH 64 /* Tag Cache Header version 'TCHxx'. Increment when changing internal structures. */ -#define TAGCACHE_MAGIC 0x54434806 +#define TAGCACHE_MAGIC 0x54434807 /* How much to allocate extra space for ramcache. */ #define TAGCACHE_RESERVE 32768 Index: apps/tagtree.c =================================================================== RCS file: /cvsroot/rockbox/apps/tagtree.c,v retrieving revision 1.55 diff -u -r1.55 tagtree.c --- apps/tagtree.c 25 Oct 2006 15:14:15 -0000 1.55 +++ apps/tagtree.c 30 Oct 2006 21:50:09 -0000 @@ -194,6 +194,7 @@ MATCH(tag, buf, "artist", tag_artist); MATCH(tag, buf, "bitrate", tag_bitrate); MATCH(tag, buf, "composer", tag_composer); + MATCH(tag, buf, "comment", tag_comment); MATCH(tag, buf, "genre", tag_genre); MATCH(tag, buf, "length", tag_length); MATCH(tag, buf, "title", tag_title); @@ -203,6 +204,7 @@ MATCH(tag, buf, "playcount", tag_playcount); MATCH(tag, buf, "lastplayed", tag_lastplayed); MATCH(tag, buf, "autoscore", tag_virt_autoscore); + MATCH(tag, buf, "relplay", tag_virt_relplay); MATCH(tag, buf, "%sort", var_sorttype); MATCH(tag, buf, "%limit", var_limit); MATCH(tag, buf, "%strip", var_strip); Index: apps/gui/gwps-common.c =================================================================== RCS file: /cvsroot/rockbox/apps/gui/gwps-common.c,v retrieving revision 1.64 diff -u -r1.64 gwps-common.c --- apps/gui/gwps-common.c 30 Oct 2006 00:23:30 -0000 1.64 +++ apps/gui/gwps-common.c 30 Oct 2006 21:50:09 -0000 @@ -504,6 +504,9 @@ case 'c': /* ID3 Composer */ return id3->composer; + case 'C': /* ID3 Comment */ + return id3->comment; + case 'y': /* year */ if( id3->year_string ) return id3->year_string; Index: firmware/id3.c =================================================================== RCS file: /cvsroot/rockbox/firmware/id3.c,v retrieving revision 1.135 diff -u -r1.135 id3.c --- firmware/id3.c 25 Oct 2006 16:57:53 -0000 1.135 +++ firmware/id3.c 30 Oct 2006 21:50:09 -0000 @@ -316,6 +316,14 @@ return bufferpos; } +/* parse comment */ +static int parsecomment( struct mp3entry* entry, char* tag, int bufferpos ) +{ + + entry->comment = tag + 4; // simplistic + return bufferpos; +} + /* parse numeric genre from string, version 2.2 and 2.3 */ static int parsegenre( struct mp3entry* entry, char* tag, int bufferpos ) { @@ -413,6 +421,7 @@ { "TYER", 4, offsetof(struct mp3entry, year_string), &parseyearnum, false }, { "TYE", 3, offsetof(struct mp3entry, year_string), &parseyearnum, false }, { "TCOM", 4, offsetof(struct mp3entry, composer), NULL, false }, + { "COMM", 4, offsetof(struct mp3entry, comment), &parsecomment, false }, { "TCON", 4, offsetof(struct mp3entry, genre_string), &parsegenre, false }, { "TCO", 3, offsetof(struct mp3entry, genre_string), &parsegenre, false }, #if CONFIG_CODEC == SWCODEC @@ -1116,6 +1125,8 @@ entry->year_string += offset; if (entry->composer) entry->composer += offset; + if (entry->comment) + entry->comment += offset; #if CONFIG_CODEC == SWCODEC if (entry->track_gain_string) entry->track_gain_string += offset; Index: firmware/export/id3.h =================================================================== RCS file: /cvsroot/rockbox/firmware/export/id3.h,v retrieving revision 1.32 diff -u -r1.32 id3.h --- firmware/export/id3.h 25 Oct 2006 16:57:53 -0000 1.32 +++ firmware/export/id3.h 30 Oct 2006 21:50:09 -0000 @@ -97,6 +97,7 @@ char* track_string; char* year_string; char* composer; + char* comment; int tracknum; int version; int layer;