diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-01-24 16:31:11 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2021-01-24 16:31:11 +0000 |
| commit | e36a4d9dafa9604dc5a2b7bd40467f9ef813ba46 (patch) | |
| tree | 1c2c17a4d492c39adb9b6ec19e7c99ae3c8b1298 | |
| parent | bd27c4aad41abbe6cf26d05f340e96ed8b7147b7 (diff) | |
| download | qmmp-e36a4d9dafa9604dc5a2b7bd40467f9ef813ba46.tar.gz qmmp-e36a4d9dafa9604dc5a2b7bd40467f9ef813ba46.tar.bz2 qmmp-e36a4d9dafa9604dc5a2b7bd40467f9ef813ba46.zip | |
fixed taglib 1.12 warnings
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9657 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/plugins/General/converter/converter.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscandialog.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.cpp | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index 2d6386b1b..49bf64d4a 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -265,7 +265,11 @@ void Converter::run() if(full_path.endsWith(".mp3", Qt::CaseInsensitive)) { TagLib::MPEG::File *mpeg_file = dynamic_cast <TagLib::MPEG::File *> (file.file()); +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 11)) mpeg_file->save(TagLib::MPEG::File::ID3v2, true); +#else + mpeg_file->save(TagLib::MPEG::File::ID3v2, TagLib::File::StripOthers); +#endif } else file.save(); diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index 4f30dd5a8..6527fcf95 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -395,7 +395,11 @@ void RGScanDialog::on_writeButton_clicked() TagLib::MPEG::File file(qPrintable(item->url)); writeAPETag(file.APETag(true), item); writeID3v2Tag(file.ID3v2Tag(true), item); +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 11)) file.save(TagLib::MPEG::File::APE | TagLib::MPEG::File::ID3v2, false); +#else + file.save(TagLib::MPEG::File::APE | TagLib::MPEG::File::ID3v2, TagLib::File::StripNone); +#endif } else if(ext == "flac") //flac { diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index 6b1eca667..3d4ef6dfa 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -409,7 +409,11 @@ void MpegFileTagModel::remove() void MpegFileTagModel::save() { if(m_tag) +#if ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION <= 11)) m_file->save(m_tagType, false); +#else + m_file->save(m_tagType, TagLib::File::StripNone, TagLib::ID3v2::Version::v4, TagLib::File::DoNotDuplicate); +#endif else m_file->strip(m_tagType); } |
