From ab4751d0926e23a933c83fa9db8829eefb2c8725 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Fri, 14 Feb 2020 09:43:06 -0500 Subject: [PATCH] Remove some unused things --- .../playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp | 8 -------- .../playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h | 5 ----- src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp | 2 -- .../playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp | 2 -- 4 files changed, 17 deletions(-) diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index 1857b9551..a5021f248 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -149,14 +149,6 @@ enum { OnZoomInVerticalID, OnZoomOutVerticalID, - // Reserve an ample block of ids for waveform scale types - OnFirstWaveformScaleID, - OnLastWaveformScaleID = OnFirstWaveformScaleID + 9, - - // Reserve an ample block of ids for spectrum scale types - OnFirstSpectrumScaleID, - OnLastSpectrumScaleID = OnFirstSpectrumScaleID + 19, - OnZoomMaxID, OnUpOctaveID, diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h index 28cf03f06..e469ec69a 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackVZoomHandle.h @@ -116,11 +116,6 @@ enum { // Reserve an ample block of ids for spectrum scale types OnFirstSpectrumScaleID, OnLastSpectrumScaleID = OnFirstSpectrumScaleID + 19, - - OnZoomMaxID, - - OnUpOctaveID, - OnDownOctaveID, }; #endif diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp index 3d6cf9c1b..4e30c37e1 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackView.cpp @@ -32,8 +32,6 @@ Paul Licameli split from TrackPanel.cpp #include "../../../../TrackPanelDrawingContext.h" #include "../../../../TrackPanelMouseEvent.h" #include "../../../../ViewInfo.h" -#include "../../../../prefs/SpectrogramSettings.h" -#include "../../../../prefs/WaveformSettings.h" #include "../../../../prefs/TracksPrefs.h" #include "../../../ui/TimeShiftHandle.h" diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp index 56f66fc03..cccadd017 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp @@ -120,10 +120,8 @@ void WaveformVZoomHandle::DoZoom( const double rate = pTrack->GetRate(); const float halfrate = rate / 2; float maxFreq = 8000.0; - const SpectrogramSettings &specSettings = pTrack->GetSpectrogramSettings(); bool bDragZoom = WaveTrackVZoomHandle::IsDragZooming(zoomStart, zoomEnd); - // Add 100 if spectral to separate the kinds of zoom. // Possibly override the zoom kind. if( bDragZoom )