mirror of
https://github.com/taglib/taglib.git
synced 2025-07-22 15:04:24 -04:00
Use a standard type rather than TagLib::uint.
This won't break the ABI compatibility.
This commit is contained in:
@ -64,7 +64,7 @@ public:
|
||||
}
|
||||
|
||||
long APELocation;
|
||||
uint APESize;
|
||||
unsigned int APESize;
|
||||
|
||||
long ID3v1Location;
|
||||
|
||||
|
@ -58,7 +58,7 @@ public:
|
||||
int version;
|
||||
int bitsPerSample;
|
||||
bool lossless;
|
||||
uint sampleFrames;
|
||||
unsigned int sampleFrames;
|
||||
};
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
@ -129,7 +129,7 @@ bool WavPack::Properties::isLossless() const
|
||||
return d->lossless;
|
||||
}
|
||||
|
||||
TagLib::uint WavPack::Properties::sampleFrames() const
|
||||
unsigned int WavPack::Properties::sampleFrames() const
|
||||
{
|
||||
return d->sampleFrames;
|
||||
}
|
||||
@ -178,7 +178,7 @@ void WavPack::Properties::read(File *file, long streamLength)
|
||||
break;
|
||||
}
|
||||
|
||||
const uint flags = data.toUInt(24, false);
|
||||
const unsigned int flags = data.toUInt(24, false);
|
||||
|
||||
if(offset == 0) {
|
||||
d->version = data.toShort(8, false);
|
||||
@ -196,7 +196,7 @@ void WavPack::Properties::read(File *file, long streamLength)
|
||||
if(flags & FINAL_BLOCK)
|
||||
break;
|
||||
|
||||
const uint blockSize = data.toUInt(4, false);
|
||||
const unsigned int blockSize = data.toUInt(4, false);
|
||||
offset += blockSize + 8;
|
||||
}
|
||||
|
||||
@ -210,7 +210,7 @@ void WavPack::Properties::read(File *file, long streamLength)
|
||||
}
|
||||
}
|
||||
|
||||
TagLib::uint WavPack::Properties::seekFinalIndex(File *file, long streamLength)
|
||||
unsigned int WavPack::Properties::seekFinalIndex(File *file, long streamLength)
|
||||
{
|
||||
const long offset = file->rfind("wvpk", streamLength);
|
||||
if(offset == -1)
|
||||
@ -225,12 +225,12 @@ TagLib::uint WavPack::Properties::seekFinalIndex(File *file, long streamLength)
|
||||
if(version < MIN_STREAM_VERS || version > MAX_STREAM_VERS)
|
||||
return 0;
|
||||
|
||||
const uint flags = data.toUInt(24, false);
|
||||
const unsigned int flags = data.toUInt(24, false);
|
||||
if(!(flags & FINAL_BLOCK))
|
||||
return 0;
|
||||
|
||||
const uint blockIndex = data.toUInt(16, false);
|
||||
const uint blockSamples = data.toUInt(20, false);
|
||||
const unsigned int blockIndex = data.toUInt(16, false);
|
||||
const unsigned int blockSamples = data.toUInt(20, false);
|
||||
|
||||
return blockIndex + blockSamples;
|
||||
}
|
||||
|
@ -39,7 +39,7 @@ namespace TagLib {
|
||||
|
||||
class File;
|
||||
|
||||
static const uint HeaderSize = 32;
|
||||
static const unsigned int HeaderSize = 32;
|
||||
|
||||
//! An implementation of audio property reading for WavPack
|
||||
|
||||
@ -126,7 +126,7 @@ namespace TagLib {
|
||||
/*!
|
||||
* Returns the total number of audio samples in file.
|
||||
*/
|
||||
uint sampleFrames() const;
|
||||
unsigned int sampleFrames() const;
|
||||
|
||||
/*!
|
||||
* Returns WavPack version.
|
||||
@ -138,7 +138,7 @@ namespace TagLib {
|
||||
Properties &operator=(const Properties &);
|
||||
|
||||
void read(File *file, long streamLength);
|
||||
uint seekFinalIndex(File *file, long streamLength);
|
||||
unsigned int seekFinalIndex(File *file, long streamLength);
|
||||
|
||||
class PropertiesPrivate;
|
||||
PropertiesPrivate *d;
|
||||
|
Reference in New Issue
Block a user