Remove unnecessary casts to sampleCount

src/WaveClip.cpp

@@ -375,7 +375,7 @@ double WaveClip::GetEndTime() const
 
 sampleCount WaveClip::GetStartSample() const
 {
-   return (sampleCount)floor(mOffset * mRate + 0.5);
+   return floor(mOffset * mRate + 0.5);
 }
 
 sampleCount WaveClip::GetEndSample() const
@@ -472,11 +472,9 @@ fillWhere(std::vector<sampleCount> &where, int len, double bias, double correcti
 {
    // Be careful to make the first value non-negative
    const double w0 = 0.5 + correction + bias + t0 * rate;
-   where[0] = sampleCount(std::max(0.0, floor(w0)));
+   where[0] = std::max(0.0, floor(w0));
    for (decltype(len) x = 1; x < len + 1; x++)
-      where[x] = sampleCount(
+      where[x] = floor(w0 + double(x) * samplesPerPixel);
-         floor(w0 + double(x) * samplesPerPixel)
-      );
 }
 
 }
@@ -1198,7 +1196,7 @@ void WaveClip::TimeToSamplesClip(double t0, sampleCount *s0) const
    else if (t0 > mOffset + double(mSequence->GetNumSamples())/mRate)
       *s0 = mSequence->GetNumSamples();
    else
-      *s0 = (sampleCount)floor(((t0 - mOffset) * mRate) + 0.5);
+      *s0 = floor(((t0 - mOffset) * mRate) + 0.5);
 }
 
 void WaveClip::ClearDisplayRect() const

src/WaveTrack.cpp

@@ -1851,7 +1851,7 @@ bool WaveTrack::Unlock() const
 
 AUDACITY_DLL_API sampleCount WaveTrack::TimeToLongSamples(double t0) const
 {
-   return (sampleCount)floor(t0 * mRate + 0.5);
+   return floor(t0 * mRate + 0.5);
 }
 
 double WaveTrack::LongSamplesToTime(sampleCount pos) const

src/effects/AutoDuck.cpp

@@ -306,7 +306,7 @@ bool EffectAutoDuck::Process()
    {
       const auto len = limitSampleBufferSize( kBufSize, end - pos );
 
-      mControlTrack->Get((samplePtr)buf, floatSample, pos, (sampleCount)len);
+      mControlTrack->Get((samplePtr)buf, floatSample, pos, len);
 
       for (auto i = pos; i < pos + len; i++)
       {

src/effects/DtmfGen.cpp

@@ -122,8 +122,8 @@ bool EffectDtmf::ProcessInitialize(sampleCount WXUNUSED(totalLen), ChannelNames
    numSamplesSequence = nT1 - nT0;  // needs to be exact number of samples selected
 
    //make under-estimates if anything, and then redistribute the few remaining samples
-   numSamplesTone = (sampleCount)floor(dtmfTone * mSampleRate);
+   numSamplesTone = floor(dtmfTone * mSampleRate);
-   numSamplesSilence = (sampleCount)floor(dtmfSilence * mSampleRate);
+   numSamplesSilence = floor(dtmfSilence * mSampleRate);
 
    // recalculate the sum, and spread the difference - due to approximations.
    // Since diff should be in the order of "some" samples, a division (resulting in zero)

src/effects/Effect.cpp

@@ -2019,7 +2019,7 @@ void Effect::GetSamples(WaveTrack *track, sampleCount *start, sampleCount *len)
    if (t1 > t0) {
       *start = track->TimeToLongSamples(t0);
       auto end = track->TimeToLongSamples(t1);
-      *len = (sampleCount)(end - *start);
+      *len = end - *start;
    }
    else {
       *start = 0;

src/effects/Equalization.cpp

@@ -1147,7 +1147,7 @@ bool EffectEqualization::ProcessOne(int count, WaveTrack * t,
 
       // now move the appropriate bit of the output back to the track
       // (this could be enhanced in the future to use the tails)
-      double offsetT0 = t->LongSamplesToTime((sampleCount)offset);
+      double offsetT0 = t->LongSamplesToTime(offset);
       double lenT = t->LongSamplesToTime(originalLen);
       // 'start' is the sample offset in 't', the passed in track
       // 'startT' is the equivalent time value

src/effects/Equalization48x.cpp

@@ -510,7 +510,7 @@ bool EffectEqualization48x::Benchmark(EffectEqualization* effectEqualization)
 
 bool EffectEqualization48x::ProcessTail(WaveTrack * t, WaveTrack * output, sampleCount start, sampleCount len)
 {
-   //	  double offsetT0 = t->LongSamplesToTime((sampleCount)offset);
+   //	  double offsetT0 = t->LongSamplesToTime(offset);
    double lenT = t->LongSamplesToTime(len);
    // 'start' is the sample offset in 't', the passed in track
    // 'startT' is the equivalent time value

src/effects/audiounits/AudioUnitEffect.cpp

@@ -1213,7 +1213,7 @@ sampleCount AudioUnitEffect::GetLatency()
                            &latency,
                            &dataSize);  
 
-      return (sampleCount) (latency * mSampleRate);
+      return latency * mSampleRate;
    }
 
    return 0;
@@ -1231,7 +1231,7 @@ sampleCount AudioUnitEffect::GetTailSize()
                         &tailTime,
                         &dataSize);  
 
-   return (sampleCount) (tailTime * mSampleRate);
+   return tailTime * mSampleRate;
 }
 
 bool AudioUnitEffect::IsReady()

src/ondemand/ODComputeSummaryTask.cpp

@@ -203,12 +203,12 @@ void ODComputeSummaryTask::Update()
                   const auto odpcmaFile =
                      std::static_pointer_cast<ODPCMAliasBlockFile>(file);
                   odpcmaFile->SetStart(block.start);
-                  odpcmaFile->SetClipOffset((sampleCount)(clip->GetStartTime()*clip->GetRate()));
+                  odpcmaFile->SetClipOffset(clip->GetStartTime()*clip->GetRate());
 
                   //these will always be linear within a sequence-lets take advantage of this by keeping a cursor.
                   while(insertCursor<(int)tempBlocks.size()&&
-                     (sampleCount)(tempBlocks[insertCursor]->GetStart()+tempBlocks[insertCursor]->GetClipOffset()) <
+                     tempBlocks[insertCursor]->GetStart() + tempBlocks[insertCursor]->GetClipOffset() <
-                        (sampleCount)(odpcmaFile->GetStart()+odpcmaFile->GetClipOffset()))
+                        odpcmaFile->GetStart() + odpcmaFile->GetClipOffset())
                      insertCursor++;
 
                   tempBlocks.insert(tempBlocks.begin() + insertCursor++, odpcmaFile);

src/ondemand/ODDecodeTask.cpp

@@ -159,12 +159,12 @@ void ODDecodeTask::Update()
                        std::static_pointer_cast<ODDecodeBlockFile>(file))->GetDecodeType() == this->GetODType())
                {
                   oddbFile->SetStart(block.start);
-                  oddbFile->SetClipOffset((sampleCount)(clip->GetStartTime()*clip->GetRate()));
+                  oddbFile->SetClipOffset(clip->GetStartTime()*clip->GetRate());
 
                   //these will always be linear within a sequence-lets take advantage of this by keeping a cursor.
                   while(insertCursor<(int)tempBlocks.size()&&
-                     (sampleCount)(tempBlocks[insertCursor]->GetStart()+tempBlocks[insertCursor]->GetClipOffset()) <
+                     tempBlocks[insertCursor]->GetStart() + tempBlocks[insertCursor]->GetClipOffset() <
-                        (sampleCount)((oddbFile->GetStart()+oddbFile->GetClipOffset())))
+                        oddbFile->GetStart() + oddbFile->GetClipOffset())
                      insertCursor++;
 
                   tempBlocks.insert(tempBlocks.begin()+insertCursor++, oddbFile);