Merge branch 'master' into merge-master-to-taglib2

# Conflicts:
#	ConfigureChecks.cmake
#	taglib/CMakeLists.txt
#	taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
#	taglib/toolkit/tfilestream.cpp
This commit is contained in:
Tsuda Kageyu
2017-06-09 11:11:44 +09:00
14 changed files with 215 additions and 181 deletions

View File

@ -973,6 +973,9 @@ public:
CPPUNIT_ASSERT(parsedFrameMvin);
CPPUNIT_ASSERT_EQUAL(String("Movement Name"), parsedFrameMvnm->toString());
CPPUNIT_ASSERT_EQUAL(String("2/3"), parsedFrameMvin->toString());
tag.addFrame(parsedFrameMvnm);
tag.addFrame(parsedFrameMvin);
}
void testDeleteFrame()