From ae3e8730da5097dbdfa4fd71a4510a6459b7a137 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 1 May 2015 07:23:27 +0000 Subject: musepack plugin: extra tags support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4887 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/mpc/mpcmetadatamodel.cpp | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Input/mpc/mpcmetadatamodel.cpp b/src/plugins/Input/mpc/mpcmetadatamodel.cpp index 1a1983199..9a07390e6 100644 --- a/src/plugins/Input/mpc/mpcmetadatamodel.cpp +++ b/src/plugins/Input/mpc/mpcmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009 by Ilya Kotov * + * Copyright (C) 2009-2015 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -86,8 +86,12 @@ const QString MPCFileTagModel::name() QList MPCFileTagModel::keys() { QList list = TagModel::keys(); - list.removeAll(Qmmp::COMPOSER); list.removeAll(Qmmp::DISCNUMBER); + if (m_tagType == TagLib::MPC::File::ID3v1) + { + list.removeAll(Qmmp::COMPOSER); + list.removeAll(Qmmp::ALBUMARTIST); + } return list; } @@ -105,6 +109,13 @@ const QString MPCFileTagModel::value(Qmmp::MetaData key) case Qmmp::ARTIST: str = m_tag->artist(); break; + case Qmmp::ALBUMARTIST: + if(m_tagType == TagLib::MPC::File::APE && + !m_file->APETag()->itemListMap()["ALBUMARTIST"].isEmpty()) + { + str = m_file->APETag()->itemListMap()["ALBUMARTIST"].toString(); + } + break; case Qmmp::ALBUM: str = m_tag->album(); break; @@ -114,6 +125,13 @@ const QString MPCFileTagModel::value(Qmmp::MetaData key) case Qmmp::GENRE: str = m_tag->genre(); break; + case Qmmp::COMPOSER: + if(m_tagType == TagLib::MPC::File::APE && + !m_file->APETag()->itemListMap()["COMPOSER"].isEmpty()) + { + str = m_file->APETag()->itemListMap()["COMPOSER"].toString(); + } + break; case Qmmp::YEAR: return QString::number(m_tag->year()); case Qmmp::TRACK: -- cgit v1.2.3-13-gbd6f