From fc6e4a4cba880f50a39c709ca38520179db23c41 Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Fri, 13 Dec 2013 01:24:47 +0000 Subject: [PATCH] Fix some compiler warnings. --- src/Sequence.cpp | 5 ++--- src/effects/lv2/LV2Effect.cpp | 6 +++--- src/widgets/KeyView.cpp | 1 - 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Sequence.cpp b/src/Sequence.cpp index 32ed975e0..eef27a26c 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -553,13 +553,11 @@ bool Sequence::Paste(sampleCount s, const Sequence *src) // it's simplest to just lump all the data together // into one big block along with the split block, // then resplit it all - unsigned int i; - BlockArray *newBlock = new BlockArray(); newBlock->Alloc(numBlocks + srcNumBlocks + 2); int newNumBlocks = 0; - for (i = 0; i < b; i++) { + for (int i = 0; i < b; i++) { newBlock->Add(mBlock->Item(i)); newNumBlocks++; } @@ -568,6 +566,7 @@ bool Sequence::Paste(sampleCount s, const Sequence *src) sampleCount splitLen = mBlock->Item(b)->f->GetLength(); int splitPoint = s - splitBlock->start; + unsigned int i; if (srcNumBlocks <= 4) { sampleCount sum = splitLen + addedLen; diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index 6efd08ae0..7e916b950 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -803,9 +803,9 @@ LV2EffectDialog::LV2EffectDialog(LV2Effect *effect, const LilvPlugin *data, int sampleRate, double length, - double noteLength, - unsigned char noteVelocity, - unsigned char noteKey) + double WXUNUSED(noteLength), + unsigned char WXUNUSED(noteVelocity), + unsigned char WXUNUSED(noteKey)) : wxDialog(parent, wxID_ANY, mEffect->GetString(lilv_plugin_get_name(data)), wxDefaultPosition, wxSize(500, -1), diff --git a/src/widgets/KeyView.cpp b/src/widgets/KeyView.cpp index 9050b828d..cb9fdf5f1 100644 --- a/src/widgets/KeyView.cpp +++ b/src/widgets/KeyView.cpp @@ -1762,7 +1762,6 @@ KeyView::GetValue(int line) return wxEmptyString; } int index = LineToIndex(line); - KeyNode *node = &mNodes[index]; // Get the label and key values wxString value;