From 6f50a640500150f77a18151e77d2ef639de03d83 Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Thu, 19 Jul 2012 23:42:47 +0000 Subject: [PATCH] comments, cleanup --- src/DirManager.h | 2 +- src/Sequence.cpp | 8 -------- src/Sequence.h | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/DirManager.h b/src/DirManager.h index 97c0b4b7d..2c6e38e4e 100644 --- a/src/DirManager.h +++ b/src/DirManager.h @@ -188,7 +188,7 @@ class DirManager: public XMLTagHandler { sampleFormat mLoadingFormat; sampleCount mLoadingBlockLen; - sampleCount mMaxSamples; + sampleCount mMaxSamples; // max samples per block static wxString globaltemp; wxString mytemp; diff --git a/src/Sequence.cpp b/src/Sequence.cpp index ec349142e..19d878492 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -448,14 +448,6 @@ bool Sequence::Copy(sampleCount s0, sampleCount s1, Sequence **dest) bool Sequence::Paste(sampleCount s, const Sequence *src) { - // This ancient code just blithely bounded s, rather than throwing an error. - // Now enforcing the bounds. - // Also, the second test should have been >, not >=, because if (s == mNumSamples), - // there's no point in setting s to mNumSamples. - //if ((s < 0) - // s = 0; - //if (s >= mNumSamples) - // s = mNumSamples; if ((s < 0) || (s > mNumSamples)) { wxLogError( diff --git a/src/Sequence.h b/src/Sequence.h index 8bc917d20..f81e217c1 100644 --- a/src/Sequence.h +++ b/src/Sequence.h @@ -184,8 +184,8 @@ class Sequence: public XMLTagHandler { sampleFormat mSampleFormat; sampleCount mNumSamples; - sampleCount mMinSamples; - sampleCount mMaxSamples; + sampleCount mMinSamples; // min samples per block + sampleCount mMaxSamples; // max samples per block bool mErrorOpening;