Update of /cvsroot/audacity/audacity-src/src/effects/ladspa In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11986/src/effects/ladspa
Modified Files: LadspaEffect.cpp LadspaEffect.h Log Message: Replace all longSampleCount with sampleCount, because sampleCount is now a 64-bit quantity which will always be big enough Index: LadspaEffect.cpp =================================================================== RCS file: /cvsroot/audacity/audacity-src/src/effects/ladspa/LadspaEffect.cpp,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- LadspaEffect.cpp 10 Jul 2008 18:39:37 -0000 1.49 +++ LadspaEffect.cpp 12 Jul 2008 15:25:48 -0000 1.50 @@ -225,7 +225,7 @@ } void LadspaEffect::GetSamples(WaveTrack *track, - longSampleCount *start, + sampleCount *start, sampleCount *len) { double trackStart = track->GetStartTime(); @@ -242,7 +242,7 @@ if (t1 > t0) { *start = track->TimeToLongSamples(t0); - longSampleCount end = track->TimeToLongSamples(t1); + sampleCount end = track->TimeToLongSamples(t1); *len = (sampleCount)(end - *start); } else { @@ -261,7 +261,7 @@ Track *left = iter.First(); Track *right; while(left) { - longSampleCount lstart = 0, rstart = 0; + sampleCount lstart = 0, rstart = 0; sampleCount len; GetSamples((WaveTrack *)left, &lstart, &len); @@ -294,8 +294,8 @@ } bool LadspaEffect::ProcessStereo(int count, WaveTrack *left, WaveTrack *right, - longSampleCount lstart, - longSampleCount rstart, + sampleCount lstart, + sampleCount rstart, sampleCount len) { /* Allocate buffers */ @@ -341,8 +341,8 @@ // Actually perform the effect here sampleCount originalLen = len; - longSampleCount ls = lstart; - longSampleCount rs = rstart; + sampleCount ls = lstart; + sampleCount rs = rstart; while (len) { int block = mBlockSize; if (block > len) Index: LadspaEffect.h =================================================================== RCS file: /cvsroot/audacity/audacity-src/src/effects/ladspa/LadspaEffect.h,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- LadspaEffect.h 12 Jun 2008 13:05:58 -0000 1.19 +++ LadspaEffect.h 12 Jul 2008 15:25:48 -0000 1.20 @@ -50,11 +50,11 @@ private: bool ProcessStereo(int count, WaveTrack * left, WaveTrack *right, - longSampleCount lstart, longSampleCount rstart, + sampleCount lstart, sampleCount rstart, sampleCount len); void GetSamples(WaveTrack *track, - longSampleCount *start, + sampleCount *start, sampleCount *len); wxString pluginName; ------------------------------------------------------------------------- Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 _______________________________________________ Audacity-cvs mailing list Audacity-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/audacity-cvs