From 86b8f1de951c4aaf462fd0e53a0fba0a6f39eb07 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Fri, 1 May 2015 07:51:58 +0000 Subject: wavpack plugin: extra tags support git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4891 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/wavpack/decoderwavpackfactory.cpp | 3 +++ src/plugins/Input/wavpack/wavpackmetadatamodel.cpp | 9 ++++++++- src/plugins/Input/wavpack/wavpackmetadatamodel.h | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp index 0384a6613..3df59958f 100644 --- a/src/plugins/Input/wavpack/decoderwavpackfactory.cpp +++ b/src/plugins/Input/wavpack/decoderwavpackfactory.cpp @@ -106,10 +106,13 @@ QList DecoderWavPackFactory::createPlayList(const QString &fileName, { char value[200]; + memset(value,0,sizeof(value)); WavpackGetTagItem (ctx, "Album", value, sizeof(value)); info->setMetaData(Qmmp::ALBUM, QString::fromUtf8(value)); WavpackGetTagItem (ctx, "Artist", value, sizeof(value)); info->setMetaData(Qmmp::ARTIST, QString::fromUtf8(value)); + WavpackGetTagItem (ctx, "Album Artist", value, sizeof(value)); + info->setMetaData(Qmmp::ALBUMARTIST, QString::fromUtf8(value)); WavpackGetTagItem (ctx, "Comment", value, sizeof(value)); info->setMetaData(Qmmp::COMMENT, QString::fromUtf8(value)); WavpackGetTagItem (ctx, "Genre", value, sizeof(value)); diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index 9fb388511..b62cb75cb 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.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 * @@ -105,6 +105,7 @@ const QString WavPackFileTagModel::name() const QString WavPackFileTagModel::value(Qmmp::MetaData key) { char value[200]; + memset(value,0,sizeof(value)); switch((int) key) { case Qmmp::TITLE: @@ -116,6 +117,9 @@ const QString WavPackFileTagModel::value(Qmmp::MetaData key) case Qmmp::ALBUM: WavpackGetTagItem (m_ctx, "Album", value, sizeof(value)); break; + case Qmmp::ALBUMARTIST: + WavpackGetTagItem (m_ctx, "Album Artist", value, sizeof(value)); + break; case Qmmp::COMMENT: WavpackGetTagItem (m_ctx, "Comment", value, sizeof(value)); break; @@ -152,6 +156,9 @@ void WavPackFileTagModel::setValue(Qmmp::MetaData key, const QString &value) case Qmmp::ALBUM: WavpackAppendTagItem (m_ctx, "Album", v, size); break; + case Qmmp::ALBUMARTIST: + WavpackAppendTagItem (m_ctx, "Album Artist", v, size); + break; case Qmmp::COMMENT: WavpackAppendTagItem (m_ctx, "Comment", v, size); break; diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.h b/src/plugins/Input/wavpack/wavpackmetadatamodel.h index 1283ba4f4..a9fd30dd8 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.h +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.h @@ -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 * -- cgit v1.2.3-13-gbd6f