diff options
| -rw-r--r-- | src/plugins/General/converter/converter.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/General/rgscan/rgscandialog.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/flac/flacmetadatamodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/mpeg/mpegmetadatamodel.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/Input/opus/opusmetadatamodel.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Input/vorbis/vorbismetadatamodel.cpp | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/src/plugins/General/converter/converter.cpp b/src/plugins/General/converter/converter.cpp index b81d4146e..37a157814 100644 --- a/src/plugins/General/converter/converter.cpp +++ b/src/plugins/General/converter/converter.cpp @@ -265,7 +265,7 @@ void Converter::run() if(full_path.endsWith(".mp3", Qt::CaseInsensitive)) { TagLib::MPEG::File *mpeg_file = dynamic_cast <TagLib::MPEG::File *> (file.file()); - mpeg_file->save(TagLib::MPEG::File::ID3v2, true); + mpeg_file->save(TagLib::MPEG::File::ID3v2, TagLib::File::StripOthers); } else file.save(); diff --git a/src/plugins/General/rgscan/rgscandialog.cpp b/src/plugins/General/rgscan/rgscandialog.cpp index c9376ba00..710a3e047 100644 --- a/src/plugins/General/rgscan/rgscandialog.cpp +++ b/src/plugins/General/rgscan/rgscandialog.cpp @@ -395,7 +395,7 @@ void RGScanDialog::on_writeButton_clicked() TagLib::MPEG::File file(qPrintable(item->url)); writeAPETag(file.APETag(true), item); writeID3v2Tag(file.ID3v2Tag(true), item); - file.save(TagLib::MPEG::File::APE | TagLib::MPEG::File::ID3v2, false); + file.save(TagLib::MPEG::File::APE | TagLib::MPEG::File::ID3v2, TagLib::File::StripNone); } else if(ext == "flac") //flac { diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp index 47841eeb7..3dc2ab5b5 100644 --- a/src/plugins/Input/flac/flacmetadatamodel.cpp +++ b/src/plugins/Input/flac/flacmetadatamodel.cpp @@ -258,7 +258,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) return; case Qmmp::DISCNUMBER: value == "0" ? - m_tag->removeField("DISCNUMBER"): + m_tag->removeFields("DISCNUMBER"): m_tag->addField("DISCNUMBER", str, true); } } diff --git a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp index a9ecad0ce..c672f39ce 100644 --- a/src/plugins/Input/mpeg/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mpeg/mpegmetadatamodel.cpp @@ -299,12 +299,18 @@ void MpegFileTagModel::setValue(Qmmp::MetaData key, const QString &value) else if (m_codec->name().contains("UTF-16BE")) type = TagLib::String::UTF16BE; - m_codec = QTextCodec::codecForName ("UTF-8"); + TagLib::ID3v2::FrameFactory *factory = TagLib::ID3v2::FrameFactory::instance(); factory->setDefaultTextEncoding(type); - m_file->setID3v2FrameFactory(factory); + m_codec = QTextCodec::codecForName("UTF-8"); type = TagLib::String::UTF8; } + else + { + TagLib::ID3v2::FrameFactory *factory = TagLib::ID3v2::FrameFactory::instance(); + factory->setDefaultTextEncoding(TagLib::String::Latin1); + } + //save additional tags TagLib::ByteVector id3v2_key; if(key == Qmmp::ALBUMARTIST) @@ -403,7 +409,7 @@ void MpegFileTagModel::remove() void MpegFileTagModel::save() { if(m_tag) - m_file->save(m_tagType, false); + m_file->save(m_tagType, TagLib::File::StripNone); else m_file->strip(m_tagType); } diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp index bc132a5a6..5ada72d2e 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -239,7 +239,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) return; case Qmmp::DISCNUMBER: value == "0" ? - m_tag->removeField("DISCNUMBER"): + m_tag->removeFields("DISCNUMBER"): m_tag->addField("DISCNUMBER", str, true); } } diff --git a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp index 3ff4c8c46..5484231e8 100644 --- a/src/plugins/Input/vorbis/vorbismetadatamodel.cpp +++ b/src/plugins/Input/vorbis/vorbismetadatamodel.cpp @@ -227,7 +227,7 @@ void VorbisCommentModel::setValue(Qmmp::MetaData key, const QString &value) return; case Qmmp::DISCNUMBER: value == "0" ? - tag->removeField("DISCNUMBER"): + tag->removeFields("DISCNUMBER"): tag->addField("DISCNUMBER", str, true); } } |