From kde-commits Sat Jan 31 20:45:24 2015 From: Anmol Ahuja Date: Sat, 31 Jan 2015 20:45:24 +0000 To: kde-commits Subject: [amarok] src/core/meta/support: Missed a file from my GSoC branch. Fixes broken lyrics tag reading a Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142273713623497 Git commit 328e023bad76ada655511aaadf669f3adef8d30e by Anmol Ahuja. Committed on 31/01/2015 at 17:36. Pushed by anmolahuja into branch 'master'. Missed a file from my GSoC branch. Fixes broken lyrics tag reading and embedding. M +6 -0 src/core/meta/support/MetaConstants.cpp http://commits.kde.org/amarok/328e023bad76ada655511aaadf669f3adef8d30e diff --git a/src/core/meta/support/MetaConstants.cpp b/src/core/meta/suppor= t/MetaConstants.cpp index 40d7122..422cdb2 100644 --- a/src/core/meta/support/MetaConstants.cpp +++ b/src/core/meta/support/MetaConstants.cpp @@ -61,6 +61,7 @@ QString Meta::nameForField( qint64 field ) case Meta::valAlbumArtist: return "albumartist"; case Meta::valLabel: return "label"; case Meta::valModified: return "modified"; + case Meta::valLyrics: return "lyrics"; default: return QString(); } } @@ -165,6 +166,9 @@ qint64 Meta::fieldForName( const QString &name ) else if( name.compare( "modified", Qt::CaseInsensitive ) =3D=3D 0 || name.compare( shortI18nForField( Meta::valModified ), Qt::Cas= eInsensitive ) =3D=3D 0 ) return Meta::valModified; + else if( name.compare( "lyrics", Qt::CaseInsensitive ) =3D=3D 0 + || name.compare( shortI18nForField( Meta::valLyrics ), Qt::CaseI= nsensitive ) =3D=3D 0 ) + return Meta::valLyrics; else return 0; } @@ -206,6 +210,7 @@ QString Meta::i18nForField( qint64 field ) case Meta::valAlbumArtist: return i18nc("Track field name", "Album Art= ist"); case Meta::valLabel: return i18nc("Track field name", "Label"); case Meta::valModified: return i18nc("Track field name", "Last Modi= fied"); + case Meta::valLyrics: return i18nc("Track field name", "Lyrics"); default: return QString(); } } @@ -249,6 +254,7 @@ QString Meta::shortI18nForField( qint64 field ) case Meta::valAlbumArtist: return i18nc("One word translation used in = the collection filter", "albumartist"); case Meta::valLabel: return i18nc("One word translation used in = the collection filter", "label"); case Meta::valModified: return i18nc("One word translation used in = the collection filter", "modified"); + case Meta::valLyrics: return i18nc("One word translation used in = the collection filter", "lyrics"); default: return QString(); } }