MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-14 00:05:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add ID3v2 tags to the metadata table

Browse Source 
ffmpeg doesn't convert ID3v2 tag names to generic metadata names, so
add the ID3v2 tag names to the table to pick them up.

This fixes scanning of MP3 files in various cases.

More in this post and its attachment:
<http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-September/076213.html>

Thanks to Raivo Hool for bringing up the issue and fix.
This commit is contained in:
Julien BLACHE 2010-03-07 19:18:06 +01:00
parent 4e74119d2a
commit 5da807f829
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/filescanner_ffmpeg.c
View File

@ -59,12 +59,17 @@ struct metadata_map {
static struct metadata_map md_map[] =
{
{ "title", 0, mfi_offsetof(title) },
{ "TIT2", 0, mfi_offsetof(title) }, /* ID3v2 */
{ "artist", 0, mfi_offsetof(artist) },
{ "author", 0, mfi_offsetof(artist) },
{ "TPE1", 0, mfi_offsetof(artist) }, /* ID3v2 */
{ "albumartist", 0, mfi_offsetof(album_artist) },
{ "album", 0, mfi_offsetof(album) },
{ "TALB", 0, mfi_offsetof(album) }, /* ID3v2 */
{ "genre", 0, mfi_offsetof(genre) },
{ "TCON", 0, mfi_offsetof(genre) }, /* ID3v2 */
{ "composer", 0, mfi_offsetof(composer) },
{ "TCOM", 0, mfi_offsetof(composer) }, /* ID3v2 */
{ "grouping", 0, mfi_offsetof(grouping) },
{ "orchestra", 0, mfi_offsetof(orchestra) },
{ "conductor", 0, mfi_offsetof(conductor) },
@ -73,10 +78,14 @@ static struct metadata_map md_map[] =
{ "totaltracks", 1, mfi_offsetof(total_tracks) },
{ "track", 1, mfi_offsetof(track) },
{ "tracknumber", 1, mfi_offsetof(track) },
{ "TRCK", 1, mfi_offsetof(track) }, /* ID3v2 */
{ "totaldiscs", 1, mfi_offsetof(total_discs) },
{ "disc", 1, mfi_offsetof(disc) },
{ "discnumber", 1, mfi_offsetof(disc) },
{ "TPOS", 1, mfi_offsetof(disc) }, /* ID3v2 */
{ "year", 1, mfi_offsetof(year) },
{ "TYER", 1, mfi_offsetof(year) }, /* ID3v2 */
{ "TDRC", 1, mfi_offsetof(year) }, /* ID3v2 */
{ "date", 1, mfi_offsetof(year) },
{ "stik", 1, mfi_offsetof(media_kind) },