diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp index 137f74d99..291b02aec 100644 --- a/src/LabelDialog.cpp +++ b/src/LabelDialog.cpp @@ -57,7 +57,7 @@ enum Column class RowData { public: - RowData(int index_, const wxString &title_, SelectedRegion selectedRegion_) + RowData(int index_, const wxString &title_, const SelectedRegion &selectedRegion_) : index(index_), title(title_), selectedRegion(selectedRegion_) {} diff --git a/src/LabelTrack.cpp b/src/LabelTrack.cpp index 1a41f823a..b865b64fa 100644 --- a/src/LabelTrack.cpp +++ b/src/LabelTrack.cpp @@ -2542,7 +2542,6 @@ bool LabelTrack::PasteOver(double t, const Track * src) labelStruct.title }; mLabels.insert(mLabels.begin() + pos++, l); - len++; } return true; diff --git a/src/Track.cpp b/src/Track.cpp index 962bdd2af..e30563164 100644 --- a/src/Track.cpp +++ b/src/Track.cpp @@ -1248,7 +1248,7 @@ unsigned TrackList::GetNumExportChannels(bool selectionOnly) const /* counters for tracks panned different places */ int numLeft = 0; int numRight = 0; - int numMono = 0; + //int numMono = 0; /* track iteration kit */ const Track *tr; TrackListConstIterator iter; @@ -1289,7 +1289,7 @@ unsigned TrackList::GetNumExportChannels(bool selectionOnly) const numRight++; } else if (pan == 0) { // panned dead center - numMono++; + // numMono++; } else { // panned somewhere else numLeft++; diff --git a/src/WaveTrack.cpp b/src/WaveTrack.cpp index 1c4ad2965..2893c4881 100644 --- a/src/WaveTrack.cpp +++ b/src/WaveTrack.cpp @@ -2249,7 +2249,7 @@ WaveClip* WaveTrack::GetClipAtTime(double time) // If "time" is the end time of the first of two such clips, and the end time is slightly // less than the start time of the second clip, then the first rather than the // second clip is found by the above code. So correct this. - if (p != clips.rend() & p != clips.rbegin() && + if (p != clips.rend() && p != clips.rbegin() && time == (*p)->GetEndTime() && (*p)->SharesBoundaryWithNextClip(*(p-1))) { p--; diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 241adee5e..b562a1053 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -2379,7 +2379,7 @@ void EffectEqualization::ErrMin(void) error += err*err; } } - while( (error < oldError) & flag ); + while( (error < oldError) && flag ); if( error > oldError ) { mEQVals[i] = mEQValsOld; //last one didn't work diff --git a/src/import/RawAudioGuess.cpp b/src/import/RawAudioGuess.cpp index 36e37b7c4..2385e244f 100644 --- a/src/import/RawAudioGuess.cpp +++ b/src/import/RawAudioGuess.cpp @@ -345,10 +345,13 @@ static int GuessFloatFormats(unsigned numTests, const ArrayOf rawData[], s size_t i = 0; for(; i < len1; i++) + // This code is testing for NaNs. + // We'd like to know if all data is finite. if (!(data1[i]>=0 || data1[i]<=0) || !(data2[i]>=0 || data2[i]<=0)) break; if (i == len1) + // all data is finite. finiteVotes++; min = data1[0];