some uses of size_t

This commit is contained in:
Paul Licameli 2016-08-24 10:43:43 -04:00
parent bf66e4410a
commit ee5a0db9ff
5 changed files with 8 additions and 7 deletions

View File

@ -1429,7 +1429,7 @@ bool WaveTrack::InsertSilence(double t, double len)
bool WaveTrack::Disjoin(double t0, double t1) bool WaveTrack::Disjoin(double t0, double t1)
{ {
sampleCount minSamples = TimeToLongSamples( WAVETRACK_MERGE_POINT_TOLERANCE ); sampleCount minSamples = TimeToLongSamples( WAVETRACK_MERGE_POINT_TOLERANCE );
sampleCount maxAtOnce = 1048576; size_t maxAtOnce = 1048576;
float *buffer = new float[ maxAtOnce ]; float *buffer = new float[ maxAtOnce ];
Regions regions; Regions regions;

View File

@ -298,7 +298,7 @@ BlockFilePtr LegacyBlockFile::BuildFromXML(const wxString &projDir, const wxChar
sampleCount len, sampleFormat format) sampleCount len, sampleFormat format)
{ {
wxFileNameWrapper fileName; wxFileNameWrapper fileName;
sampleCount summaryLen = 0; size_t summaryLen = 0;
bool noRMS = false; bool noRMS = false;
long nValue; long nValue;
@ -324,6 +324,7 @@ BlockFilePtr LegacyBlockFile::BuildFromXML(const wxString &projDir, const wxChar
else if (!wxStrcmp(attr, wxT("format")) && XMLValueChecker::IsValidSampleFormat(nValue)) else if (!wxStrcmp(attr, wxT("format")) && XMLValueChecker::IsValidSampleFormat(nValue))
format = (sampleFormat)nValue; format = (sampleFormat)nValue;
else if (!wxStrcmp(attr, wxT("summarylen")) && (nValue > 0)) else if (!wxStrcmp(attr, wxT("summarylen")) && (nValue > 0))
// Note attribute "summarylen" was written as int, no need for 64 bits
summaryLen = nValue; summaryLen = nValue;
} }
} }

View File

@ -288,7 +288,7 @@ bool EffectAutoDuck::Process()
int rmsPos = 0; int rmsPos = 0;
float rmsSum = 0; float rmsSum = 0;
float *rmsWindow = new float[kRMSWindowSize]; float *rmsWindow = new float[kRMSWindowSize];
for (i = 0; i < kRMSWindowSize; i++) for (size_t i = 0; i < kRMSWindowSize; i++)
rmsWindow[i] = 0; rmsWindow[i] = 0;
float *buf = new float[kBufSize]; float *buf = new float[kBufSize];
@ -393,7 +393,7 @@ bool EffectAutoDuck::Process()
WaveTrack* t = (WaveTrack*)iterTrack; WaveTrack* t = (WaveTrack*)iterTrack;
for (i = 0; i < (int)regions.GetCount(); i++) for (size_t i = 0; i < regions.GetCount(); i++)
{ {
const AutoDuckRegion& region = regions[i]; const AutoDuckRegion& region = regions[i];
if (ApplyDuckFade(trackNumber, t, region.t0, region.t1)) if (ApplyDuckFade(trackNumber, t, region.t0, region.t1))

View File

@ -366,7 +366,7 @@ bool EffectCompressor::InitPass1()
DisableSecondPass(); DisableSecondPass();
// Find the maximum block length required for any track // Find the maximum block length required for any track
sampleCount maxlen=0; size_t maxlen = 0;
SelectedTrackListOfKindIterator iter(Track::Wave, mTracks); SelectedTrackListOfKindIterator iter(Track::Wave, mTracks);
WaveTrack *track = (WaveTrack *) iter.First(); WaveTrack *track = (WaveTrack *) iter.First();
while (track) { while (track) {

View File

@ -534,7 +534,7 @@ bool EffectDtmf::MakeDtmfTone(float *buffer, sampleCount len, float fs, wxChar t
// generate a fade-in of duration 1/250th of second // generate a fade-in of duration 1/250th of second
if (last == 0) { if (last == 0) {
A = (fs / kFadeInOut); A = (fs / kFadeInOut);
for(sampleCount i = 0; i < A; i++) { for(size_t i = 0; i < A; i++) {
buffer[i] *= i/A; buffer[i] *= i/A;
} }
} }
@ -548,7 +548,7 @@ bool EffectDtmf::MakeDtmfTone(float *buffer, sampleCount len, float fs, wxChar t
// protect against negative offset, which can occur if too a // protect against negative offset, which can occur if too a
// small selection is made // small selection is made
if (offset >= 0) { if (offset >= 0) {
for(sampleCount i = 0; i < A; i++) { for(size_t i = 0; i < A; i++) {
buffer[i + offset] *= (1 - (i / A)); buffer[i + offset] *= (1 - (i / A));
} }
} }