diff options
Diffstat (limited to 'src/plugins/Input/vorbis')
| -rw-r--r-- | src/plugins/Input/vorbis/decodervorbisfactory.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp index 6ef82b38f..64e33492f 100644 --- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp +++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp @@ -83,12 +83,12 @@ QList<TrackInfo *> DecoderVorbisFactory::createPlayList(const QString &path, Tra info->setValue(Qmmp::YEAR, tag->year()); info->setValue(Qmmp::TRACK, tag->track()); TagLib::Ogg::FieldListMap items = tag->fieldListMap(); - if(items.contains("ALBUMARTIST")) - info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].front())); - if(items.contains("COMPOSER")) - info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].front())); - if(items.contains("DISCNUMBER")) - info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].front())); + if(!items["ALBUMARTIST"].isEmpty()) + info->setValue(Qmmp::ALBUMARTIST, TStringToQString(items["ALBUMARTIST"].toString())); + if(!items["COMPOSER"].isEmpty()) + info->setValue(Qmmp::COMPOSER, TStringToQString(items["COMPOSER"].toString())); + if(!items["DISCNUMBER"].isEmpty()) + info->setValue(Qmmp::DISCNUMBER, TStringToQString(items["DISCNUMBER"].toString())); } if((parts & TrackInfo::Properties) && fileRef.audioProperties()) diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 94a49ae59..10901a212 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -162,7 +162,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const if(tag->fieldListMap()["ALBUMARTIST"].isEmpty()) return QString(); else - return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].front()); + return TStringToQString(tag->fieldListMap()["ALBUMARTIST"].toString()); case Qmmp::ALBUM: return TStringToQString(tag->album()); case Qmmp::COMMENT: @@ -173,7 +173,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const if(tag->fieldListMap()["COMPOSER"].isEmpty()) return QString(); else - return TStringToQString(tag->fieldListMap()["COMPOSER"].front()); + return TStringToQString(tag->fieldListMap()["COMPOSER"].toString()); case Qmmp::YEAR: return QString::number(tag->year()); case Qmmp::TRACK: @@ -182,7 +182,7 @@ QString VorbisCommentModel::value(Qmmp::MetaData key) const if(tag->fieldListMap()["DISCNUMBER"].isEmpty()) return QString(); else - return TStringToQString(tag->fieldListMap()["DISCNUMBER"].front()); + return TStringToQString(tag->fieldListMap()["DISCNUMBER"].toString()); } return QString(); } |