Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-17 16:40:07 +02:00
Code Issues Releases Wiki Activity

Remove a few unused members from class TrackPanel, and an unused #include

Browse Source
This commit is contained in:
Paul Licameli 2015-09-06 12:37:05 -04:00 committed by Paul Licameli
parent 333c9aa91d
commit c300c33901
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Snap.cpp
View File

@ -16,7 +16,6 @@
#include "Project.h" #include "Project.h"
#include "LabelTrack.h" #include "LabelTrack.h"
#include "TrackPanel.h"
#include "WaveTrack.h" #include "WaveTrack.h"
#include <wx/arrimpl.cpp> #include <wx/arrimpl.cpp>

5
src/TrackPanel.cpp
View File

@ -436,7 +436,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
mRuler(ruler), mRuler(ruler),
mTrackArtist(nullptr), mTrackArtist(nullptr),
mRefreshBacking(false), mRefreshBacking(false),
mConverter(NumericConverter::TIME),
mAutoScrolling(false), mAutoScrolling(false),
mVertScrollRemainder(0), mVertScrollRemainder(0),
vrulerSize(36,0) vrulerSize(36,0)
@ -474,8 +473,6 @@ TrackPanel::TrackPanel(wxWindow * parent, wxWindowID id,
mSlideCursor = MakeCursor( wxCURSOR_SIZEWE, TimeCursorXpm, 16, 16); mSlideCursor = MakeCursor( wxCURSOR_SIZEWE, TimeCursorXpm, 16, 16);
mZoomInCursor = MakeCursor( wxCURSOR_MAGNIFIER, ZoomInCursorXpm, 19, 15); mZoomInCursor = MakeCursor( wxCURSOR_MAGNIFIER, ZoomInCursorXpm, 19, 15);
mZoomOutCursor = MakeCursor( wxCURSOR_MAGNIFIER, ZoomOutCursorXpm, 19, 15); mZoomOutCursor = MakeCursor( wxCURSOR_MAGNIFIER, ZoomOutCursorXpm, 19, 15);
mLabelCursorLeft = MakeCursor( wxCURSOR_ARROW, LabelCursorLeftXpm, 19, 15);
mLabelCursorRight = MakeCursor( wxCURSOR_ARROW, LabelCursorRightXpm, 16, 16);
#ifdef EXPERIMENTAL_SPECTRAL_EDITING #ifdef EXPERIMENTAL_SPECTRAL_EDITING
mBottomFrequencyCursor = mBottomFrequencyCursor =
@ -1357,7 +1354,7 @@ bool TrackPanel::SetCursorByActivity( )
case IsAdjustingLabel: case IsAdjustingLabel:
case IsSelectingLabelText: case IsSelectingLabelText:
return true; return true;
#ifdef USE_MIDI #if 0
case IsStretching: case IsStretching:
SetCursor( unsafe SetCursor( unsafe
? *mDisabledCursor ? *mDisabledCursor

19
src/TrackPanel.h
View File

@ -686,18 +686,6 @@ protected:
wxRect mCapturedTrackLocationRect; wxRect mCapturedTrackLocationRect;
wxRect mCapturedRect; wxRect mCapturedRect;
// When sliding horizontally, the moving clip may automatically
// snap to the beginning and ending of other clips, or to label
// starts and stops. When you start sliding, SlideSnapFromPoints
// gets populated with the start and stop times of selected clips,
// and SlideSnapToPoints gets populated with the start and stop times
// of other clips. In both cases, times that are within 3 pixels
// of another at the same zoom level are eliminated; you can't snap
// when there are two things arbitrarily close at that zoom level.
wxBaseArrayDouble mSlideSnapFromPoints;
wxBaseArrayDouble mSlideSnapToPoints;
wxArrayInt mSlideSnapLinePixels;
bool mDidSlideVertically; bool mDidSlideVertically;
bool mRedrawAfterStop; bool mRedrawAfterStop;
@ -740,8 +728,6 @@ public:
protected: protected:
NumericConverter mConverter;
WaveTrack * mDrawingTrack; // Keeps track of which track you are drawing on between events cf. HandleDraw() WaveTrack * mDrawingTrack; // Keeps track of which track you are drawing on between events cf. HandleDraw()
int mDrawingTrackTop; // Keeps track of the top position of the drawing track. int mDrawingTrackTop; // Keeps track of the top position of the drawing track.
sampleCount mDrawingStartSample; // sample of last click-down sampleCount mDrawingStartSample; // sample of last click-down
@ -812,9 +798,6 @@ protected:
IsMinimizing, IsMinimizing,
WasOverCutLine, WasOverCutLine,
IsPopping, IsPopping,
#ifdef USE_MIDI
IsStretching,
#endif
IsZooming, IsZooming,
#ifdef EXPERIMENTAL_MIDI_OUT #ifdef EXPERIMENTAL_MIDI_OUT
IsVelocitySliding, IsVelocitySliding,
@ -840,7 +823,7 @@ protected:
mResizeCursor, mSlideCursor, mEnvelopeCursor, // doubles as the center frequency cursor mResizeCursor, mSlideCursor, mEnvelopeCursor, // doubles as the center frequency cursor
// for spectral selection // for spectral selection
mSmoothCursor, mZoomInCursor, mZoomOutCursor, mSmoothCursor, mZoomInCursor, mZoomOutCursor,
mLabelCursorLeft, mLabelCursorRight, mRearrangeCursor, mRearrangeCursor,
mDisabledCursor, mAdjustLeftSelectionCursor, mAdjustRightSelectionCursor; mDisabledCursor, mAdjustLeftSelectionCursor, mAdjustRightSelectionCursor;
#ifdef EXPERIMENTAL_SPECTRAL_EDITING #ifdef EXPERIMENTAL_SPECTRAL_EDITING
std::unique_ptr<wxCursor> std::unique_ptr<wxCursor>