From 3ae7e20d7adee45c37bf66ec428ea0ef3226f986 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sat, 27 Mar 2010 17:18:23 +0100 Subject: added more frame types to vorbis and apev2 loaders --- plugins/flac/flac.c | 20 +++++++++++++++++++- plugins/vorbis/vorbis.c | 17 ++++++++++++++++- 2 files changed, 35 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/flac/flac.c b/plugins/flac/flac.c index 173df64c..0c6d232f 100644 --- a/plugins/flac/flac.c +++ b/plugins/flac/flac.c @@ -520,7 +520,25 @@ cflac_init_metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__Str else if (!strncasecmp (s, "COMMENT=", 8)) { deadbeef->pl_add_meta (it, "comment", s + 8); } - if (!strncasecmp (s, "CUESHEET=", 9)) { + else if (!strncasecmp (s, "PERFORMER=", 10)) { + deadbeef->pl_add_meta (it, "performer", s + 10); + } + else if (!strncasecmp (s, "ENSEMBLE=", 9)) { + deadbeef->pl_add_meta (it, "band", s + 9); + } + else if (!strncasecmp (s, "COMPOSER=", 9)) { + deadbeef->pl_add_meta (it, "composer", s + 9); + } + else if (!strncasecmp (s, "ENCODED-BY=", 11)) { + deadbeef->pl_add_meta (it, "vendor", s + 11); + } + else if (!strncasecmp (s, "DISCNUMBER=", 11)) { + deadbeef->pl_add_meta (it, "disc", s + 11); + } + else if (!strncasecmp (s, "COPYRIGHT=", 10)) { + deadbeef->pl_add_meta (it, "copyright", s + 10); + } + else if (!strncasecmp (s, "CUESHEET=", 9)) { deadbeef->pl_add_meta (it, "cuesheet", s + 9); // info->last = deadbeef->pl_insert_cue_from_buffer (info->after, info->fname, s+9, c->length-9, &plugin, "FLAC", info->totalsamples, info->samplerate); } diff --git a/plugins/vorbis/vorbis.c b/plugins/vorbis/vorbis.c index 96b25933..11a93dc2 100644 --- a/plugins/vorbis/vorbis.c +++ b/plugins/vorbis/vorbis.c @@ -92,9 +92,24 @@ update_vorbis_comments (DB_playItem_t *it, vorbis_comment *vc) { else if (!strncasecmp (vc->user_comments[i], "date=", 5)) { deadbeef->pl_add_meta (it, "year", vc->user_comments[i] + 5); } - else if (!strncasecmp (vc->user_comments[i], "comment=", 8)) { + else if (!strncasecmp (vc->user_comments[i], "COMMENT=", 8)) { deadbeef->pl_add_meta (it, "comment", vc->user_comments[i] + 8); } + else if (!strncasecmp (vc->user_comments[i], "PERFORMER=", 10)) { + deadbeef->pl_add_meta (it, "performer", vc->user_comments[i] + 10); + } + else if (!strncasecmp (vc->user_comments[i], "ENSEMBLE=", 9)) { + deadbeef->pl_add_meta (it, "band", vc->user_comments[i] + 9); + } + else if (!strncasecmp (vc->user_comments[i], "COMPOSER=", 9)) { + deadbeef->pl_add_meta (it, "composer", vc->user_comments[i] + 9); + } + else if (!strncasecmp (vc->user_comments[i], "ENCODED-BY=", 11)) { + deadbeef->pl_add_meta (it, "vendor", vc->user_comments[i] + 11); + } + else if (!strncasecmp (vc->user_comments[i], "DISCNUMBER=", 11)) { + deadbeef->pl_add_meta (it, "disc", vc->user_comments[i] + 11); + } else if (!strncasecmp (vc->user_comments[i], "genre=", 6)) { deadbeef->pl_add_meta (it, "genre", vc->user_comments[i] + 6); } -- cgit v1.2.3