Index: apps/metadata.c =================================================================== RCS file: /cvsroot/rockbox/apps/metadata.c,v retrieving revision 1.58 diff -u -r1.58 metadata.c --- apps/metadata.c 10 Nov 2006 12:26:26 -0000 1.58 +++ apps/metadata.c 12 Nov 2006 20:30:26 -0000 @@ -30,6 +30,7 @@ #include "replaygain.h" #include "debug.h" #include "system.h" +#include "dircache.h" enum tagtype { TAGTYPE_APE = 1, TAGTYPE_VORBIS }; @@ -113,6 +114,96 @@ 32000, 44100, 48000, 64000, 88200, 96000, 192000 }; +/* checks for existence of file if possible using dircache */ +bool exists(const char* pathname) { + + bool found = false; + int fd; + +/* debugf("EXISTS %s?\n", pathname);*/ + +#ifdef HAVE_DIRCACHE + if(dircache_is_enabled()) + found = (NULL != dircache_get_entry_ptr(pathname)); + else +#endif + + { + fd=open(pathname, O_RDONLY); + if(fd>-1) { + close(fd); + found = true; + } + } + return found; + +} + +unsigned char aa_strings[4][6] = {"NONE", "FILE", "ALBUM", "DIR"}; + + +void has_albumart(struct mp3entry* id3) { + + int found = 0; + unsigned char *path, *dot, *slash; + int length, alength; + + /* is valid id3 ? */ + if(!(id3 && (path=id3->path) && (dot=strrchr(path,'.')))) + return; + + length=dot-path; + + /* try .jpg */ + memcpy(path+length,".jpg",5); + if(exists(path)) found = 1; + + /* try .jpg */ + if((!found) && (id3->album != NULL)){ + slash=strrchr(path,'/'); + length = slash ? slash-path+1 : 0; + + alength = strlen(id3->album); + memcpy(path+length,id3->album,alength); + + memcpy(path+length+alength,".jpg",5); + if(exists(path)) found = 2; + } + + /* try folder.jpg */ + if(!found){ + memcpy(path+length,"folder.jpg",11); + if(exists(path)) found = 3; + } + + id3->albumart = found; + +} + +unsigned char lyr_strings[5][5] = {"NONE", "LRC8", "LRC", "SNC", "TXT"}; + +void has_lyrics(struct mp3entry* id3) { + + + int found = 0; + unsigned char *path, *dot; + int length, i; + + /* is valid id3 ? */ + if(!(id3 && (path=id3->path) && (dot=strrchr(path,'.')))) + return; + + length=dot-path+1; + + for(i=1; (i<5) && (found==0); i++) { + memcpy(path+length,lyr_strings[i],strlen(lyr_strings[i])+1); + if(exists(path)) found = i; + } + + id3->lyrics = found; + +} + /* Read a string from the file. Read up to size bytes, or, if eos != -1, * until the eos character is found (eos is not stored in buf, unless it is * nil). Writes up to buf_size chars to buf, always terminating with a nil. @@ -306,6 +397,10 @@ { p = &(id3->composer); } + else if (strcasecmp(name, "comment") == 0) + { + p = &(id3->comment); + } else { len = parse_replaygain(name, value, id3, buf, buf_remaining); @@ -1916,9 +2011,16 @@ } /* We have successfully read the metadata from the file */ - lseek(fd, 0, SEEK_SET); strncpy(track->id3.path, trackname, sizeof(track->id3.path)); + + has_lyrics(&track->id3); +/* only changes extensions - no need to restore path */ +/* strncpy(track->id3.path, trackname, sizeof(track->id3.path)); */ + + has_albumart(&track->id3); + strncpy(track->id3.path, trackname, sizeof(track->id3.path)); + track->taginfo_ready = true; return true; Index: apps/tagcache.c =================================================================== RCS file: /cvsroot/rockbox/apps/tagcache.c,v retrieving revision 1.77 diff -u -r1.77 tagcache.c --- apps/tagcache.c 10 Nov 2006 09:52:46 -0000 1.77 +++ apps/tagcache.c 12 Nov 2006 21:45:14 -0000 @@ -102,18 +102,18 @@ 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 }; +static const int numeric_tags[] = { tag_year, tag_lyrics, tag_albumart, tag_tracknumber, tag_length, tag_bitrate, + tag_playcount, tag_rating, 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", - "playcount", "playtime", "lastplayed" }; + "filename", "composer", "comment", "year", "lyrics", "albumart", "tracknumber", "bitrate", "length", + "playcount", "rating", "playtime", "lastplayed" }; /* Status information of the tagcache. */ static struct tagcache_stat tc_stat; @@ -646,6 +646,7 @@ switch (tag) { + case tag_virt_relplay: case tag_virt_autoscore: if (idx->tag_seek[tag_length] == 0 || idx->tag_seek[tag_playcount] == 0) @@ -655,8 +656,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; @@ -1539,6 +1552,8 @@ /* Numeric tags */ entry.tag_offset[tag_year] = track.id3.year; + entry.tag_offset[tag_lyrics] = track.id3.lyrics; + entry.tag_offset[tag_albumart] = track.id3.albumart; entry.tag_offset[tag_tracknumber] = track.id3.tracknum; entry.tag_offset[tag_length] = track.id3.length; entry.tag_offset[tag_bitrate] = track.id3.bitrate; @@ -1550,6 +1565,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 */ @@ -1562,6 +1578,7 @@ write_item(track.id3.album); write_item(genrestr); write_item(track.id3.composer); + write_item(track.id3.comment); total_entry_count++; } @@ -2724,7 +2741,7 @@ char tag_data[TAG_MAXLEN+32]; int idx_id; long masterfd = (long)parameters; - const int import_tags[] = { tag_playcount, tag_playtime, tag_lastplayed }; + const int import_tags[] = { tag_playcount, tag_rating, tag_playtime, tag_lastplayed }; int i; (void)line_n; Index: apps/tagcache.h =================================================================== RCS file: /cvsroot/rockbox/apps/tagcache.h,v retrieving revision 1.30 diff -u -r1.30 tagcache.h --- apps/tagcache.h 10 Nov 2006 08:03:22 -0000 1.30 +++ apps/tagcache.h 12 Nov 2006 20:27:01 -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_bitrate, tag_length, tag_playcount, tag_playtime, tag_lastplayed, + tag_filename, tag_composer, tag_comment, tag_year, tag_lyrics, tag_albumart, tag_tracknumber, + tag_bitrate, tag_length, tag_playcount, tag_rating, tag_playtime, tag_lastplayed, /* Virtual tags */ - tag_virt_autoscore }; + tag_virt_autoscore, tag_virt_relplay }; -#define TAG_COUNT 13 +#define TAG_COUNT 17 /* Maximum length of a single tag. */ #define TAG_MAXLEN (MAX_PATH*2) @@ -40,7 +40,7 @@ #define IDX_BUF_DEPTH 64 /* Tag Cache Header version 'TCHxx'. Increment when changing internal structures. */ -#define TAGCACHE_MAGIC 0x54434806 +#define TAGCACHE_MAGIC 0x5443480a /* 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.56 diff -u -r1.56 tagtree.c --- apps/tagtree.c 11 Nov 2006 17:39:37 -0000 1.56 +++ apps/tagtree.c 12 Nov 2006 20:32:24 -0000 @@ -195,15 +195,20 @@ 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); MATCH(tag, buf, "filename", tag_filename); MATCH(tag, buf, "tracknum", tag_tracknumber); MATCH(tag, buf, "year", tag_year); + MATCH(tag, buf, "lyrics", tag_lyrics); + MATCH(tag, buf, "albumart", tag_albumart); MATCH(tag, buf, "playcount", tag_playcount); + MATCH(tag, buf, "rating", tag_rating); 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); @@ -598,9 +603,10 @@ } id3->playcount = tagcache_get_numeric(&tcs, tag_playcount); + if(!id3->rating) id3->rating = tagcache_get_numeric(&tcs, tag_rating); id3->lastplayed = tagcache_get_numeric(&tcs, tag_lastplayed); - id3->rating = tagcache_get_numeric(&tcs, tag_virt_autoscore) / 10; - + id3->score = tagcache_get_numeric(&tcs, tag_virt_autoscore) / 10; + tagcache_search_finish(&tcs); } @@ -608,6 +614,9 @@ { (void)last_track; long playcount; + long lyrics; + long albumart; + long rating; long playtime; long lastplayed; @@ -637,6 +646,10 @@ playcount++; + lyrics = (long) id3->lyrics; + albumart = (long) id3->albumart; + rating = (long) id3->rating; + lastplayed = tagcache_increase_serial(); if (lastplayed < 0) { @@ -649,12 +662,15 @@ playtime += MIN(id3->length, id3->elapsed + 15 * 1000); logf("ube:%s", id3->path); - logf("-> %d/%d/%d", last_track, playcount, playtime); + logf("-> %d/%d/%d/%d/%d/%d", last_track, playcount, lyrics, albumart, rating, playtime); logf("-> %d/%d/%d", id3->elapsed, id3->length, MIN(id3->length, id3->elapsed + 15 * 1000)); /* lastplayed not yet supported. */ if (!tagcache_modify_numeric_entry(&tcs, tag_playcount, playcount) + || !tagcache_modify_numeric_entry(&tcs, tag_lyrics, lyrics) + || !tagcache_modify_numeric_entry(&tcs, tag_albumart, albumart) + || !tagcache_modify_numeric_entry(&tcs, tag_rating, rating) || !tagcache_modify_numeric_entry(&tcs, tag_playtime, playtime) || !tagcache_modify_numeric_entry(&tcs, tag_lastplayed, lastplayed)) { @@ -1148,6 +1168,11 @@ } else dptr->name = tcs->result; + + if(tcs->type == tag_lyrics) + dptr->name = lyr_strings[atoi(tcs->result)]; + else if(tcs->type == tag_albumart) + dptr->name = aa_strings[atoi(tcs->result)]; dptr++; current_entry_count++; 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 12 Nov 2006 20:31:16 -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; @@ -551,6 +554,16 @@ *flags |= WPS_REFRESH_STATIC; switch(tag[1]) { + case 'a': + *flags |= WPS_REFRESH_DYNAMIC; + *intval = id3->albumart+1; + return aa_strings[id3->albumart]; + + case 'l': + *flags |= WPS_REFRESH_DYNAMIC; + *intval = id3->lyrics+1; + return lyr_strings[id3->lyrics]; + case 'v': /* VBR file? */ return id3->vbr ? "(avg)" : NULL; @@ -927,6 +940,7 @@ { case 'p': /* Playcount */ *flags |= WPS_REFRESH_STATIC; + *intval = cid3->playcount+1; snprintf(buf, buf_size, "%ld", cid3->playcount); return buf; case 'r': /* Rating */ Index: firmware/id3.c =================================================================== RCS file: /cvsroot/rockbox/firmware/id3.c,v retrieving revision 1.138 diff -u -r1.138 id3.c --- firmware/id3.c 10 Nov 2006 08:03:23 -0000 1.138 +++ firmware/id3.c 12 Nov 2006 20:27:01 -0000 @@ -343,6 +343,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 ) { @@ -440,6 +448,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 @@ -1143,6 +1152,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.34 diff -u -r1.34 id3.h --- firmware/export/id3.h 6 Nov 2006 19:49:03 -0000 1.34 +++ firmware/export/id3.h 12 Nov 2006 20:40:00 -0000 @@ -23,6 +23,9 @@ #include "config.h" #include "file.h" +extern unsigned char aa_strings[4][6]; +extern unsigned char lyr_strings[5][5]; + /* Audio file types. */ enum { @@ -139,6 +142,7 @@ char* track_string; char* year_string; char* composer; + char* comment; int tracknum; int version; int layer; @@ -189,8 +193,13 @@ long songentryoffset; long rundbentryoffset; + /* associated file indicators */ + short lyrics; + short albumart; + /* runtime database fields */ short rating; + short score; long playcount; long lastplayed;