From 53936ac9700902416445edc858894f4c5d1306d6 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 18 Sep 2016 10:59:50 -0400 Subject: [PATCH] Fix some warnings for unused variables and labels... ... But not in cases where a return status is ignored. --- src/PlatformCompatibility.cpp | 2 +- src/Project.cpp | 8 ++++---- src/effects/audiounits/AudioUnitEffect.cpp | 2 +- src/import/ImportQT.cpp | 4 ++-- src/toolbars/ToolDock.cpp | 2 +- src/tracks/ui/Scrubbing.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/PlatformCompatibility.cpp b/src/PlatformCompatibility.cpp index 0c79d72d1..6133a3cf9 100644 --- a/src/PlatformCompatibility.cpp +++ b/src/PlatformCompatibility.cpp @@ -51,7 +51,7 @@ wxString PlatformCompatibility::ConvertSlashInFileName(const wxString& filePath) wxString path = filePath; wxString filename; wxString newPath = filePath; - int pathLen = 1; + // int pathLen = 1; while (!wxDirExists(wxPathOnly(newPath)) && ! path.IsEmpty()) { path = newPath.BeforeLast('/'); filename = newPath.AfterLast('/'); diff --git a/src/Project.cpp b/src/Project.cpp index 8bbae5beb..a415cd9f2 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -181,9 +181,9 @@ ODLock &AudacityProject::AllProjectDeleteMutex() }; #if defined(__WXMAC__) -const int sbarSpaceWidth = 15; -const int sbarControlWidth = 16; -const int sbarExtraLen = 1; +// const int sbarSpaceWidth = 15; +// const int sbarControlWidth = 16; +// const int sbarExtraLen = 1; const int sbarHjump = 30; //STM: This is how far the thumb jumps when the l/r buttons are pressed, or auto-scrolling occurs -- in pixels #elif defined(__WXMSW__) const int sbarSpaceWidth = 16; @@ -414,7 +414,7 @@ public: bool OnDrop(wxCoord x, wxCoord y) override { - bool foundSupported = false; + // bool foundSupported = false; #if !wxCHECK_VERSION(3, 0, 0) bool firstFileAdded = false; OSErr result; diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index 22284a61a..cb428c8eb 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -1753,7 +1753,7 @@ void AudioUnitEffect::SetHostUI(EffectUIHostInterface *host) bool AudioUnitEffect::PopulateUI(wxWindow *parent) { - OSStatus result; + // OSStatus result; mDialog = static_cast(wxGetTopLevelParent(parent)); mParent = parent; diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp index c7eca9bc9..32b189382 100644 --- a/src/import/ImportQT.cpp +++ b/src/import/ImportQT.cpp @@ -392,7 +392,7 @@ int QTImportFileHandle::Import(TrackFactory *trackFactory, } } while (false); -done: +// done: if (maer) { MovieAudioExtractionEnd(maer); @@ -441,7 +441,7 @@ void QTImportFileHandle::AddMetadata(Tags *tags) for (int i = 0; i < WXSIZEOF(names); i++) { QTMetaDataItem item = kQTMetaDataItemUninitialized; - OSType key = names[i].key; + // OSType key = names[i].key; err = QTMetaDataGetNextItem(metaDataRef, kQTMetaDataStorageFormatWildcard, diff --git a/src/toolbars/ToolDock.cpp b/src/toolbars/ToolDock.cpp index 7d8a3e3e9..d8ee5ee05 100644 --- a/src/toolbars/ToolDock.cpp +++ b/src/toolbars/ToolDock.cpp @@ -832,7 +832,7 @@ void ToolDock::Updated() // void ToolDock::OnGrabber( GrabberEvent & event ) { - auto pos = event.GetPosition(); + // auto pos = event.GetPosition(); if (!event.IsEscaping()) { ToolBar *t = mBars[ event.GetId() ]; diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp index f41442a3e..275a82111 100644 --- a/src/tracks/ui/Scrubbing.cpp +++ b/src/tracks/ui/Scrubbing.cpp @@ -55,7 +55,7 @@ enum { }; static const double MinStutter = 0.2; -static const double MaxDragSpeed = 1.0; +// static const double MaxDragSpeed = 1.0; namespace { double FindScrubbingSpeed(const ViewInfo &viewInfo, double maxScrubSpeed, double screen, double timeAtMouse)