diff --git a/lib-src/portmixer/src/px_win_endpoint.c b/lib-src/portmixer/src/px_win_endpoint.c index f4eb56cd8..34c7f3038 100644 --- a/lib-src/portmixer/src/px_win_endpoint.c +++ b/lib-src/portmixer/src/px_win_endpoint.c @@ -246,9 +246,6 @@ int open_ep_mixers_byid(px_mixer *Px, wchar_t *deviceIn, wchar_t *deviceOut) IMMDeviceEnumerator *denum = NULL; IMMDevice *device = NULL; HRESULT hr; - MMRESULT res; - LPWSTR idStr; - size_t idLen; if (!initialize(Px)) { goto fail; diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp index 1a780f49f..56b71539f 100644 --- a/src/AudacityLogger.cpp +++ b/src/AudacityLogger.cpp @@ -68,6 +68,7 @@ void AudacityLogger::Flush() } } +// ANSWER-ME: This is unused. Can it be deleted? If not, note that t param is unused. void AudacityLogger::DoLogString(const wxChar *str, time_t t) { if (!wxIsMainThread()) { @@ -257,7 +258,7 @@ void AudacityLogger::Show(bool show) Flush(); } -void AudacityLogger::OnCloseWindow(wxCloseEvent & e) +void AudacityLogger::OnCloseWindow(wxCloseEvent & WXUNUSED(e)) { #if defined(__WXMAC__) // On the Mac, destroy the window rather than hiding it since the @@ -269,13 +270,13 @@ void AudacityLogger::OnCloseWindow(wxCloseEvent & e) #endif } -void AudacityLogger::OnClose(wxCommandEvent & e) +void AudacityLogger::OnClose(wxCommandEvent & WXUNUSED(e)) { wxCloseEvent dummy; OnCloseWindow(dummy); } -void AudacityLogger::OnClear(wxCommandEvent & e) +void AudacityLogger::OnClear(wxCommandEvent & WXUNUSED(e)) { mBuffer = wxEmptyString; @@ -284,7 +285,7 @@ void AudacityLogger::OnClear(wxCommandEvent & e) Flush(); } -void AudacityLogger::OnSave(wxCommandEvent & e) +void AudacityLogger::OnSave(wxCommandEvent & WXUNUSED(e)) { wxString fName = _("log.txt"); diff --git a/src/Sequence.cpp b/src/Sequence.cpp index dad2b67ac..d576f8c45 100644 --- a/src/Sequence.cpp +++ b/src/Sequence.cpp @@ -506,7 +506,7 @@ bool Sequence::Paste(sampleCount s, const Sequence *src) return ConsistencyCheck(wxT("Paste branch one")); } - if (b >= 0 && b < numBlocks + if ((b >= 0 ) && (b < (int)numBlocks) && ((mBlock->Item(b)->f->GetLength() + addedLen) < mMaxSamples)) { // Special case: we can fit all of the new samples inside of // one block! diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index 83d036729..3a24428c3 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -4,7 +4,7 @@ LV2Effect.h - Audacity(R) is copyright (c) 1999-2008 Audacity Team. + Audacity(R) is copyright (c) 1999-2013 Audacity Team. License: GPL v2. See License.txt. *********************************************************************/ diff --git a/src/widgets/Grid.cpp b/src/widgets/Grid.cpp index bd035862f..04b195e5a 100644 --- a/src/widgets/Grid.cpp +++ b/src/widgets/Grid.cpp @@ -301,7 +301,7 @@ bool ChoiceEditor::EndEdit(int row, int col, int sel = Choice()->GetSelection(); // This can happen if the wxChoice control is displayed and the list of choices get changed - if (sel < 0 || sel >= mChoices.GetCount()) + if ((sel < 0) || (sel >= (int)(mChoices.GetCount()))) { return false; } diff --git a/src/widgets/valnum.cpp b/src/widgets/valnum.cpp index d9515b5d9..1c2abf47e 100644 --- a/src/widgets/valnum.cpp +++ b/src/widgets/valnum.cpp @@ -123,7 +123,6 @@ void wxNumValidatorBase::OnChar(wxKeyEvent& event) return; #if wxUSE_UNICODE - wxKeyEvent & e = event; const int ch = event.GetUnicodeKey(); const int c = event.GetKeyCode(); if ( c > WXK_START )