diff options
| -rw-r--r-- | junklib.c | 68 | ||||
| -rw-r--r-- | plugins/gtkui/trkproperties.c | 1 |
2 files changed, 69 insertions, 0 deletions
@@ -827,6 +827,10 @@ junk_read_id3v2 (playItem_t *it, DB_FILE *fp) { char *comment = NULL; char *copyright = NULL; char *genre = NULL; + char *performer = NULL; + char *composer = NULL; + char *numtracks = NULL; + char *disc = NULL; int err = 0; while (readptr - tag <= size - 4) { if (version_major == 3 || version_major == 4) { @@ -952,7 +956,25 @@ junk_read_id3v2 (playItem_t *it, DB_FILE *fp) { } char str[sz+2]; id3v2_string_read (version_major, &str[0], sz, unsync, readptr); + track = convstr (str, sz); + + char *slash = strchr (track, '/'); + if (slash) { + // split into track/number + *slash = 0; + slash++; + numtracks = strdup (slash); + } + } + else if (!strcmp (frameid, "TPOS")) { + if (sz > 1000) { + err = 1; + break; // too large + } + char str[sz+2]; + id3v2_string_read (version_major, &str[0], sz, unsync, readptr); + disc = convstr (str, sz); } else if (!strcmp (frameid, "TIT2")) { trace ("parsing TIT2...\n"); @@ -1033,6 +1055,36 @@ junk_read_id3v2 (playItem_t *it, DB_FILE *fp) { comment = convstr (str, s+1); trace ("COMM text: %s\n", comment); } + else if (!strcmp (frameid, "TENC")) { + if (sz > 1000) { + err = 1; + break; // too large + } + char str[sz+2]; + id3v2_string_read (version_major, &str[0], sz, unsync, readptr); + vendor = convstr (str, sz); + trace ("TENC: %s\n", vendor); + } + else if (!strcmp (frameid, "TPE3")) { + if (sz > 1000) { + err = 1; + break; // too large + } + char str[sz+2]; + id3v2_string_read (version_major, &str[0], sz, unsync, readptr); + performer = convstr (str, sz); + trace ("TPE3: %s\n", performer); + } + else if (!strcmp (frameid, "TCOM")) { + if (sz > 1000) { + err = 1; + break; // too large + } + char str[sz+2]; + id3v2_string_read (version_major, &str[0], sz, unsync, readptr); + composer = convstr (str, sz); + trace ("TCOM: %s\n", composer); + } else if (!strcmp (frameid, "TXXX")) { if (sz < 2) { trace ("TXXX frame is too short, skipped\n"); @@ -1234,10 +1286,22 @@ junk_read_id3v2 (playItem_t *it, DB_FILE *fp) { pl_add_meta (it, "band", band); free (band); } + if (performer) { + pl_add_meta (it, "performer", performer); + free (performer); + } + if (composer) { + pl_add_meta (it, "composer", composer); + free (composer); + } if (track) { pl_add_meta (it, "track", track); free (track); } + if (numtracks) { + pl_add_meta (it, "numtracks", numtracks); + free (numtracks); + } if (title) { pl_add_meta (it, "title", title); free (title); @@ -1280,6 +1344,10 @@ junk_read_id3v2 (playItem_t *it, DB_FILE *fp) { pl_add_meta (it, "comment", comment); free (comment); } + if (disc) { + pl_add_meta (it, "disc", disc); + free (disc); + } if (!title) { pl_add_meta (it, "title", NULL); } diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c index 2d3f59f5..a3e2a413 100644 --- a/plugins/gtkui/trkproperties.c +++ b/plugins/gtkui/trkproperties.c @@ -147,6 +147,7 @@ show_track_properties_dlg (DB_playItem_t *it) { "numtracks", "Total Tracks", "disc", "Disc Number", "comment", "Comment", + "vendor", "Encoded by", NULL }; |