mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #654 from TsudaKageyu/xiph-setcomment

Browse Source 
Fix XiphComment::setComment() for the case that a Vorbis comment has …
This commit is contained in:
Tsuda Kageyu 2015-11-20 23:02:51 +09:00
commit 94c941928a
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
taglib/ogg/xiphcomment.cpp
View File

@ -137,7 +137,14 @@ void Ogg::XiphComment::setAlbum(const String &s)
void Ogg::XiphComment::setComment(const String &s)
{
addField(d->commentField.isEmpty() ? "DESCRIPTION" : d->commentField, s);
if(d->commentField.isEmpty()) {
if(!d->fieldListMap["DESCRIPTION"].isEmpty())
d->commentField = "DESCRIPTION";
else
d->commentField = "COMMENT";
}
addField(d->commentField, s);
}
void Ogg::XiphComment::setGenre(const String &s)

18
tests/test_xiphcomment.cpp
View File

@ -1,5 +1,6 @@
#include <string>
#include <stdio.h>
#include <flacfile.h>
#include <xiphcomment.h>
#include <tpropertymap.h>
#include <tdebug.h>
@ -17,6 +18,7 @@ class TestXiphComment : public CppUnit::TestFixture
CPPUNIT_TEST(testTrack);
CPPUNIT_TEST(testSetTrack);
CPPUNIT_TEST(testInvalidKeys);
CPPUNIT_TEST(testClearComment);
CPPUNIT_TEST_SUITE_END();
public:
@ -74,6 +76,22 @@ public:
CPPUNIT_ASSERT(cmt.properties().isEmpty());
}
void testClearComment()
{
ScopedFileCopy copy("no-tags", ".flac");
{
FLAC::File f(copy.fileName().c_str());
f.xiphComment()->addField("COMMENT", "Comment1");
f.save();
}
{
FLAC::File f(copy.fileName().c_str());
f.xiphComment()->setComment("");
CPPUNIT_ASSERT_EQUAL(String(""), f.xiphComment()->comment());
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestXiphComment);