diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-07-14 16:46:29 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2014-07-14 16:46:29 +0000 |
| commit | 2aa6a2255b596361dcf902a5f26a08af0c9b9796 (patch) | |
| tree | 23227eb8a04358899d17931254d080d24808ae40 | |
| parent | 9abf16b0a323e595683b86b89951641fa225fbee (diff) | |
| download | qmmp-2aa6a2255b596361dcf902a5f26a08af0c9b9796.tar.gz qmmp-2aa6a2255b596361dcf902a5f26a08af0c9b9796.tar.bz2 qmmp-2aa6a2255b596361dcf902a5f26a08af0c9b9796.zip | |
flac: fixed disc number disappearing when using embedded cue
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4370 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/Input/flac/decoder_flac.cpp | 10 | ||||
| -rw-r--r-- | src/plugins/Input/flac/decoderflacfactory.cpp | 8 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp index 454febdde..acd76f159 100644 --- a/src/plugins/Input/flac/decoder_flac.cpp +++ b/src/plugins/Input/flac/decoder_flac.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -290,8 +290,12 @@ bool DecoderFLAC::initialize() data()->input->open(QIODevice::ReadOnly); if(xiph_comment->contains("DISCNUMBER") && !xiph_comment->fieldListMap()["DISCNUMBER"].isEmpty()) { - m_parser->info(m_track)->setMetaData(Qmmp::DISCNUMBER, - QString::fromUtf8(xiph_comment->fieldListMap()["DISCNUMBER"].toString().toCString(true)).trimmed()); + TagLib::StringList fld = xiph_comment->fieldListMap()["DISCNUMBER"]; + for(int i = 1; i <= m_parser->count(); i++) + { + m_parser->info(i)->setMetaData(Qmmp::DISCNUMBER, + QString::fromUtf8(fld.toString().toCString(true)).trimmed()); + } } QMap<Qmmp::MetaData, QString> metaData = m_parser->info(m_track)->metaData(); addMetaData(metaData); //send metadata diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp index 163889099..d45a8164c 100644 --- a/src/plugins/Input/flac/decoderflacfactory.cpp +++ b/src/plugins/Input/flac/decoderflacfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2008-2012 by Ilya Kotov * + * Copyright (C) 2008-2014 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -134,10 +134,8 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo CUEParser parser(tag->fieldListMap()["CUESHEET"].toString().toCString(true), fileName); if(tag->contains("DISCNUMBER") && !tag->fieldListMap()["DISCNUMBER"].isEmpty()) { - TagLib::StringList fld; - fld = tag->fieldListMap()["DISCNUMBER"]; - int i; - for(i=1; i<=parser.count(); i++) + TagLib::StringList fld = tag->fieldListMap()["DISCNUMBER"]; + for(int i = 1; i <= parser.count(); i++) { parser.info(i)->setMetaData(Qmmp::DISCNUMBER, QString::fromUtf8(fld.toString().toCString(true)).trimmed()); |