mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-22 06:54:22 -04: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

55
taglib/xm/xmfile.cpp
View File

@ -31,7 +31,6 @@
using namespace TagLib;
using namespace XM;
using TagLib::uint;
using TagLib::ushort;
using TagLib::ulong;
/*!
@ -180,11 +179,11 @@ protected:
bool bigEndian;
};
class U16Reader : public NumberReader<ushort>
class U16Reader : public NumberReader<unsigned short>
{
public:
U16Reader(ushort &value, bool bigEndian)
: NumberReader<ushort>(value, bigEndian) {}
U16Reader(unsigned short &value, bool bigEndian)
: NumberReader<unsigned short>(value, bigEndian) {}
uint read(TagLib::File &file, uint limit)
{
@ -268,7 +267,7 @@ public:
* Read a unsigned 16 Bit integer into \a number. The byte order
* is controlled by \a bigEndian.
*/
StructReader &u16(ushort &number, bool bigEndian)
StructReader &u16(unsigned short &number, bool bigEndian)
{
m_readers.append(new U16Reader(number, bigEndian));
return *this;
@ -277,7 +276,7 @@ public:
/*!
* Read a unsigned 16 Bit little endian integer into \a number.
*/
StructReader &u16L(ushort &number)
StructReader &u16L(unsigned short &number)
{
return u16(number, false);
}
@ -285,7 +284,7 @@ public:
/*!
* Read a unsigned 16 Bit big endian integer into \a number.
*/
StructReader &u16B(ushort &number)
StructReader &u16B(unsigned short &number)
{
return u16(number, true);
}
@ -416,22 +415,22 @@ bool XM::File::save()
return false;
seek(70);
ushort patternCount = 0;
ushort instrumentCount = 0;
unsigned short patternCount = 0;
unsigned short instrumentCount = 0;
if(!readU16L(patternCount) || !readU16L(instrumentCount))
return false;
long pos = 60 + headerSize; // should be long long in taglib2.
// need to read patterns again in order to seek to the instruments:
for(ushort i = 0; i < patternCount; ++ i) {
for(unsigned short i = 0; i < patternCount; ++ i) {
seek(pos);
ulong patternHeaderLength = 0;
if(!readU32L(patternHeaderLength) || patternHeaderLength < 4)
return false;
seek(pos + 7);
ushort dataSize = 0;
unsigned short dataSize = 0;
if (!readU16L(dataSize))
return false;
@ -440,7 +439,7 @@ bool XM::File::save()
const StringList lines = d->tag.comment().split("\n");
uint sampleNameIndex = instrumentCount;
for(ushort i = 0; i < instrumentCount; ++ i) {
for(unsigned short i = 0; i < instrumentCount; ++ i) {
seek(pos);
ulong instrumentHeaderSize = 0;
if(!readU32L(instrumentHeaderSize) || instrumentHeaderSize < 4)
@ -453,7 +452,7 @@ bool XM::File::save()
else
writeString(lines[i], len);
ushort sampleCount = 0;
unsigned short sampleCount = 0;
if(instrumentHeaderSize >= 29U) {
seek(pos + 27);
if(!readU16L(sampleCount))
@ -469,7 +468,7 @@ bool XM::File::save()
pos += instrumentHeaderSize;
for(ushort j = 0; j < sampleCount; ++ j) {
for(unsigned short j = 0; j < sampleCount; ++ j) {
if(sampleHeaderSize > 4U) {
seek(pos);
ulong sampleLength = 0;
@ -513,14 +512,14 @@ void XM::File::read(bool)
READ_U32L_AS(headerSize);
READ_ASSERT(headerSize >= 4);
ushort length = 0;
ushort restartPosition = 0;
ushort channels = 0;
ushort patternCount = 0;
ushort instrumentCount = 0;
ushort flags = 0;
ushort tempo = 0;
ushort bpmSpeed = 0;
unsigned short length = 0;
unsigned short restartPosition = 0;
unsigned short channels = 0;
unsigned short patternCount = 0;
unsigned short instrumentCount = 0;
unsigned short flags = 0;
unsigned short tempo = 0;
unsigned short bpmSpeed = 0;
StructReader header;
header.u16L(length)
@ -549,13 +548,13 @@ void XM::File::read(bool)
seek(60 + headerSize);
// read patterns:
for(ushort i = 0; i < patternCount; ++ i) {
for(unsigned short i = 0; i < patternCount; ++ i) {
READ_U32L_AS(patternHeaderLength);
READ_ASSERT(patternHeaderLength >= 4);
unsigned char packingType = 0;
ushort rowCount = 0;
ushort dataSize = 0;
unsigned short rowCount = 0;
unsigned short dataSize = 0;
StructReader pattern;
pattern.byte(packingType).u16L(rowCount).u16L(dataSize);
@ -570,13 +569,13 @@ void XM::File::read(bool)
uint sumSampleCount = 0;
// read instruments:
for(ushort i = 0; i < instrumentCount; ++ i) {
for(unsigned short i = 0; i < instrumentCount; ++ i) {
READ_U32L_AS(instrumentHeaderSize);
READ_ASSERT(instrumentHeaderSize >= 4);
String instrumentName;
unsigned char instrumentType = 0;
ushort sampleCount = 0;
unsigned short sampleCount = 0;
StructReader instrument;
instrument.string(instrumentName, 22).byte(instrumentType).u16L(sampleCount);
@ -594,7 +593,7 @@ void XM::File::read(bool)
// skip unhandeled header proportion:
seek(instrumentHeaderSize - count - 4, Current);
for(ushort j = 0; j < sampleCount; ++ j) {
for(unsigned short j = 0; j < sampleCount; ++ j) {
ulong sampleLength = 0;
ulong loopStart = 0;
ulong loopLength = 0;

50
taglib/xm/xmproperties.cpp
View File

@ -41,16 +41,16 @@ public:
{
}
ushort lengthInPatterns;
int channels;
ushort version;
ushort restartPosition;
ushort patternCount;
ushort instrumentCount;
unsigned short lengthInPatterns;
int channels;
unsigned short version;
unsigned short restartPosition;
unsigned short patternCount;
unsigned short instrumentCount;
uint sampleCount;
ushort flags;
ushort tempo;
ushort bpmSpeed;
unsigned short flags;
unsigned short tempo;
unsigned short bpmSpeed;
};
XM::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
@ -94,27 +94,27 @@ int XM::Properties::channels() const
return d->channels;
}
TagLib::ushort XM::Properties::lengthInPatterns() const
unsigned short XM::Properties::lengthInPatterns() const
{
return d->lengthInPatterns;
}
TagLib::ushort XM::Properties::version() const
unsigned short XM::Properties::version() const
{
return d->version;
}
TagLib::ushort XM::Properties::restartPosition() const
unsigned short XM::Properties::restartPosition() const
{
return d->restartPosition;
}
TagLib::ushort XM::Properties::patternCount() const
unsigned short XM::Properties::patternCount() const
{
return d->patternCount;
}
TagLib::ushort XM::Properties::instrumentCount() const
unsigned short XM::Properties::instrumentCount() const
{
return d->instrumentCount;
}
@ -124,22 +124,22 @@ TagLib::uint XM::Properties::sampleCount() const
return d->sampleCount;
}
TagLib::ushort XM::Properties::flags() const
unsigned short XM::Properties::flags() const
{
return d->flags;
}
TagLib::ushort XM::Properties::tempo() const
unsigned short XM::Properties::tempo() const
{
return d->tempo;
}
TagLib::ushort XM::Properties::bpmSpeed() const
unsigned short XM::Properties::bpmSpeed() const
{
return d->bpmSpeed;
}
void XM::Properties::setLengthInPatterns(ushort lengthInPatterns)
void XM::Properties::setLengthInPatterns(unsigned short lengthInPatterns)
{
d->lengthInPatterns = lengthInPatterns;
}
@ -149,22 +149,22 @@ void XM::Properties::setChannels(int channels)
d->channels = channels;
}
void XM::Properties::setVersion(ushort version)
void XM::Properties::setVersion(unsigned short version)
{
d->version = version;
}
void XM::Properties::setRestartPosition(ushort restartPosition)
void XM::Properties::setRestartPosition(unsigned short restartPosition)
{
d->restartPosition = restartPosition;
}
void XM::Properties::setPatternCount(ushort patternCount)
void XM::Properties::setPatternCount(unsigned short patternCount)
{
d->patternCount = patternCount;
}
void XM::Properties::setInstrumentCount(ushort instrumentCount)
void XM::Properties::setInstrumentCount(unsigned short instrumentCount)
{
d->instrumentCount = instrumentCount;
}
@ -174,17 +174,17 @@ void XM::Properties::setSampleCount(uint sampleCount)
d->sampleCount = sampleCount;
}
void XM::Properties::setFlags(ushort flags)
void XM::Properties::setFlags(unsigned short flags)
{
d->flags = flags;
}
void XM::Properties::setTempo(ushort tempo)
void XM::Properties::setTempo(unsigned short tempo)
{
d->tempo = tempo;
}
void XM::Properties::setBpmSpeed(ushort bpmSpeed)
void XM::Properties::setBpmSpeed(unsigned short bpmSpeed)
{
d->bpmSpeed = bpmSpeed;
}

32
taglib/xm/xmproperties.h
View File

@ -46,27 +46,27 @@ namespace TagLib {
int sampleRate() const;
int channels() const;
ushort lengthInPatterns() const;
ushort version() const;
ushort restartPosition() const;
ushort patternCount() const;
ushort instrumentCount() const;
unsigned short lengthInPatterns() const;
unsigned short version() const;
unsigned short restartPosition() const;
unsigned short patternCount() const;
unsigned short instrumentCount() const;
uint sampleCount() const;
ushort flags() const;
ushort tempo() const;
ushort bpmSpeed() const;
unsigned short flags() const;
unsigned short tempo() const;
unsigned short bpmSpeed() const;
void setChannels(int channels);
void setLengthInPatterns(ushort lengthInPatterns);
void setVersion(ushort version);
void setRestartPosition(ushort restartPosition);
void setPatternCount(ushort patternCount);
void setInstrumentCount(ushort instrumentCount);
void setLengthInPatterns(unsigned short lengthInPatterns);
void setVersion(unsigned short version);
void setRestartPosition(unsigned short restartPosition);
void setPatternCount(unsigned short patternCount);
void setInstrumentCount(unsigned short instrumentCount);
void setSampleCount(uint sampleCount);
void setFlags(ushort flags);
void setTempo(ushort tempo);
void setBpmSpeed(ushort bpmSpeed);
void setFlags(unsigned short flags);
void setTempo(unsigned short tempo);
void setBpmSpeed(unsigned short bpmSpeed);
private:
Properties(const Properties&);