mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-02-12 11:12:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use a standard type rather than TagLib::ushort.

Browse Source 
This won't break the ABI compatibility.
This commit is contained in:
Tsuda Kageyu
2015-12-02 18:59:45 +09:00
parent 8bdddaabce
commit dcc0fe553c
22 changed files with 212 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/test_it.cpp
View File

@ -108,14 +108,14 @@ private:
CPPUNIT_ASSERT_EQUAL( 0, p->bitrate());
CPPUNIT_ASSERT_EQUAL( 0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(64, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL(true, p->stereo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)535, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)532, p->compatibleVersion());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 9, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short)535, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short)532, p->compatibleVersion());
CPPUNIT_ASSERT_EQUAL((unsigned short) 9, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned char)128, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char) 48, p->mixVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char)125, p->tempo());

12
tests/test_s3m.cpp
View File

@ -98,13 +98,13 @@ private:
CPPUNIT_ASSERT_EQUAL( 0, p->bitrate());
CPPUNIT_ASSERT_EQUAL( 0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(16, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL(false, p->stereo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)4896, p->trackerVersion());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 2, p->fileFormatVersion());
CPPUNIT_ASSERT_EQUAL((unsigned short) 5, p->sampleCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short)4896, p->trackerVersion());
CPPUNIT_ASSERT_EQUAL((unsigned short) 2, p->fileFormatVersion());
CPPUNIT_ASSERT_EQUAL((unsigned char) 64, p->globalVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char) 48, p->masterVolume());
CPPUNIT_ASSERT_EQUAL((unsigned char)125, p->tempo());

32
tests/test_xm.cpp
View File

@ -130,14 +130,14 @@ public:
CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(8, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0 , p->restartPosition());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0 , p->restartPosition());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned short)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL(titleBefore, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());
@ -176,14 +176,14 @@ private:
CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
CPPUNIT_ASSERT_EQUAL(8, p->channels());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)260, p->version());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->restartPosition());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)128, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((TagLib::ushort)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->lengthInPatterns());
CPPUNIT_ASSERT_EQUAL((unsigned short)260, p->version());
CPPUNIT_ASSERT_EQUAL((unsigned short) 0, p->restartPosition());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->patternCount());
CPPUNIT_ASSERT_EQUAL((unsigned short)128, p->instrumentCount());
CPPUNIT_ASSERT_EQUAL((unsigned short) 1, p->flags());
CPPUNIT_ASSERT_EQUAL((unsigned short) 6, p->tempo());
CPPUNIT_ASSERT_EQUAL((unsigned short)125, p->bpmSpeed());
CPPUNIT_ASSERT_EQUAL(title, t->title());
CPPUNIT_ASSERT_EQUAL(String(), t->artist());
CPPUNIT_ASSERT_EQUAL(String(), t->album());