Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-26 00:03:52 +02:00
Code Issues Releases Wiki Activity

Make many counts of tracks and channels unsigned...

Browse Source 
... And in some places where a library uses signed types, assert that
the reported number is not negative.

What led me to this, is that there are many places where a size_t value for
an allocation is the product of a number of channels and some other number.
This commit is contained in:
Paul Licameli
2016-09-02 15:53:09 -04:00
parent ef23de6a60
commit 67cec5ad83
81 changed files with 272 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mix.cpp
View File

@@ -241,7 +241,7 @@ Mixer::WarpOptions::WarpOptions(double min, double max)
Mixer::Mixer(const WaveTrackConstArray &inputTracks,
const WarpOptions &warpOptions,
double startTime, double stopTime,
int numOutChannels, int outBufferSize, bool outInterleaved,
unsigned numOutChannels, int outBufferSize, bool outInterleaved,
double outRate, sampleFormat outFormat,
bool highQuality, MixerSpec *mixerSpec)
{
@@ -376,7 +376,7 @@ void Mixer::Clear()
}
}
void MixBuffers(int numChannels, int *channelFlags, float *gains,
void MixBuffers(unsigned numChannels, int *channelFlags, float *gains,
samplePtr src, SampleBuffer *dests,
int len, bool interleaved)
{
@@ -385,7 +385,7 @@ void MixBuffers(int numChannels, int *channelFlags, float *gains,
continue;
samplePtr destPtr;
int skip;
unsigned skip;
if (interleaved) {
destPtr = dests[0].ptr() + c*SAMPLE_SIZE(floatSample);
@@ -747,7 +747,7 @@ void Mixer::SetTimesAndSpeed(double t0, double t1, double speed)
Reposition(t0);
}
MixerSpec::MixerSpec( int numTracks, int maxNumChannels )
MixerSpec::MixerSpec( unsigned numTracks, unsigned maxNumChannels )
{
mNumTracks = mNumChannels = numTracks;
mMaxNumChannels = maxNumChannels;
@@ -795,7 +795,7 @@ void MixerSpec::Free()
delete[] mMap;
}
bool MixerSpec::SetNumChannels( int newNumChannels )
bool MixerSpec::SetNumChannels( unsigned newNumChannels )
{
if( mNumChannels == newNumChannels )
return true;