From 4a5abc9e41cc48bc81afd9e9cdb606b6328f2c59 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 21 May 2019 13:36:29 -0400 Subject: [PATCH] Pass AudacityProject* to more methods of UIHandle --- src/AdornedRulerPanel.cpp | 4 ++-- src/CellularPanel.cpp | 8 ++++---- src/UIHandle.cpp | 4 ++-- src/UIHandle.h | 4 ++-- src/tracks/labeltrack/ui/LabelGlyphHandle.cpp | 2 +- src/tracks/labeltrack/ui/LabelGlyphHandle.h | 2 +- src/tracks/labeltrack/ui/LabelTextHandle.cpp | 2 +- src/tracks/labeltrack/ui/LabelTextHandle.h | 2 +- .../playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp | 2 +- .../playabletrack/notetrack/ui/NoteTrackButtonHandle.h | 2 +- .../playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp | 2 +- .../playabletrack/notetrack/ui/NoteTrackVZoomHandle.h | 2 +- src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp | 2 +- src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h | 2 +- src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp | 2 +- src/tracks/playabletrack/wavetrack/ui/SampleHandle.h | 2 +- .../playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp | 2 +- .../playabletrack/wavetrack/ui/SpectrumVZoomHandle.h | 2 +- .../playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp | 2 +- .../playabletrack/wavetrack/ui/WaveformVZoomHandle.h | 2 +- src/tracks/ui/ButtonHandle.cpp | 2 +- src/tracks/ui/ButtonHandle.h | 2 +- src/tracks/ui/EnvelopeHandle.cpp | 2 +- src/tracks/ui/EnvelopeHandle.h | 2 +- src/tracks/ui/SelectHandle.cpp | 4 ++-- src/tracks/ui/SelectHandle.h | 6 +++--- src/tracks/ui/SliderHandle.cpp | 2 +- src/tracks/ui/SliderHandle.h | 2 +- src/tracks/ui/TimeShiftHandle.cpp | 2 +- src/tracks/ui/TimeShiftHandle.h | 2 +- 30 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/AdornedRulerPanel.cpp b/src/AdornedRulerPanel.cpp index 8338568b6..4c169ca1c 100644 --- a/src/AdornedRulerPanel.cpp +++ b/src/AdornedRulerPanel.cpp @@ -495,7 +495,7 @@ protected: return RefreshCode::DrawOverlays; } - void Enter(bool) override + void Enter(bool, AudacityProject *) override { mChangeHighlight = RefreshCode::DrawOverlays; } @@ -649,7 +649,7 @@ protected: return RefreshCode::DrawOverlays; } - void Enter(bool) override + void Enter(bool, AudacityProject *) override { mChangeHighlight = RefreshCode::DrawOverlays; } diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp index 17ba3859f..4337b3b1b 100644 --- a/src/CellularPanel.cpp +++ b/src/CellularPanel.cpp @@ -183,7 +183,7 @@ bool CellularPanel::HandleEscapeKey(bool down) { auto target = Target(); - if (target && target->HasEscape() && target->Escape()) { + if (target && target->HasEscape() && target->Escape(GetProject())) { HandleCursorForPresentMouseState(false); return true; } @@ -331,7 +331,7 @@ void CellularPanel::HandleMotion refreshCode = updateFlags; if (handle && handle != oldHandle) - handle->Enter(true); + handle->Enter(true, GetProject()); if (oldHandle == handle) oldHandle.reset(); @@ -436,7 +436,7 @@ bool CellularPanel::ChangeTarget(bool forward, bool cycle) return true; else if (cycle && (size == 1 || IsMouseCaptured())) { // Rotate through the states of this target only. - target->Enter(forward); + target->Enter(forward, GetProject()); return true; } } @@ -453,7 +453,7 @@ bool CellularPanel::ChangeTarget(bool forward, bool cycle) state.mTarget += size - 1; state.mTarget %= size; if (Target()) - Target()->Enter(forward); + Target()->Enter(forward, GetProject()); return true; } diff --git a/src/UIHandle.cpp b/src/UIHandle.cpp index 3658f22ae..72ec38576 100644 --- a/src/UIHandle.cpp +++ b/src/UIHandle.cpp @@ -17,7 +17,7 @@ UIHandle::~UIHandle() { } -void UIHandle::Enter(bool) +void UIHandle::Enter(bool, AudacityProject *) { } @@ -36,7 +36,7 @@ bool UIHandle::HasEscape() const return false; } -bool UIHandle::Escape() +bool UIHandle::Escape(AudacityProject *) { return false; } diff --git a/src/UIHandle.h b/src/UIHandle.h index 337e4e84c..d4822d338 100644 --- a/src/UIHandle.h +++ b/src/UIHandle.h @@ -47,7 +47,7 @@ public: // This might put the handle into its first rotated state // (or last, if forward is false) or mark itself as needing a highlight. // Default does nothing. - virtual void Enter(bool forward); + virtual void Enter(bool forward, AudacityProject *pProject); // Tell whether the handle has more than one TAB key rotation state. // Default is always false. @@ -65,7 +65,7 @@ public: // The handle may change state and mark itself for highlight change. // Default does nothing and returns false - virtual bool Escape(); + virtual bool Escape(AudacityProject *pProject); // Assume hit test (implemented in other classes) was positive. // May return Cancelled, overriding the hit test decision and stopping drag. diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp index fcac1f46a..b914ea9a7 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.cpp @@ -68,7 +68,7 @@ LabelGlyphHandle::LabelGlyphHandle { } -void LabelGlyphHandle::Enter(bool) +void LabelGlyphHandle::Enter(bool, AudacityProject *) { mChangeHighlight = RefreshCode::RefreshCell; } diff --git a/src/tracks/labeltrack/ui/LabelGlyphHandle.h b/src/tracks/labeltrack/ui/LabelGlyphHandle.h index f06164cce..11fbc86ae 100644 --- a/src/tracks/labeltrack/ui/LabelGlyphHandle.h +++ b/src/tracks/labeltrack/ui/LabelGlyphHandle.h @@ -63,7 +63,7 @@ public: virtual ~LabelGlyphHandle(); - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.cpp b/src/tracks/labeltrack/ui/LabelTextHandle.cpp index e1331e7a2..63100d14a 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.cpp +++ b/src/tracks/labeltrack/ui/LabelTextHandle.cpp @@ -33,7 +33,7 @@ LabelTextHandle::LabelTextHandle { } -void LabelTextHandle::Enter(bool) +void LabelTextHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/labeltrack/ui/LabelTextHandle.h b/src/tracks/labeltrack/ui/LabelTextHandle.h index 6446ee16d..dbd6a1de5 100644 --- a/src/tracks/labeltrack/ui/LabelTextHandle.h +++ b/src/tracks/labeltrack/ui/LabelTextHandle.h @@ -38,7 +38,7 @@ public: std::shared_ptr GetTrack() const { return mpLT.lock(); } int GetLabelNum() const { return mLabelNum; } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp index abc4cc5c5..70897dc74 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp @@ -30,7 +30,7 @@ NoteTrackButtonHandle::NoteTrackButtonHandle { } -void NoteTrackButtonHandle::Enter(bool) +void NoteTrackButtonHandle::Enter(bool, AudacityProject *) { mChangeHighlight = RefreshCode::RefreshCell; } diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h index ca9eb5aad..a0ffcd187 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.h @@ -46,7 +46,7 @@ public: const NoteTrackButtonHandle &newState); protected: - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp index 321094907..e9e08b056 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp @@ -60,7 +60,7 @@ NoteTrackVZoomHandle::NoteTrackVZoomHandle { } -void NoteTrackVZoomHandle::Enter(bool) +void NoteTrackVZoomHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h index 222c20c1d..e28b9aca7 100644 --- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h +++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.h @@ -36,7 +36,7 @@ public: std::shared_ptr GetTrack() const { return mpTrack.lock(); } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp index 57f0e0d16..15e530fc0 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.cpp @@ -31,7 +31,7 @@ CutlineHandle::CutlineHandle { } -void CutlineHandle::Enter(bool) +void CutlineHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h index 3d7835372..6325cf319 100644 --- a/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/CutlineHandle.h @@ -43,7 +43,7 @@ public: const WaveTrackLocation &GetLocation() { return mLocation; } std::shared_ptr GetTrack() { return mpTrack; } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp index 21b7c02b9..de70e2a8c 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.cpp @@ -41,7 +41,7 @@ SampleHandle::SampleHandle( const std::shared_ptr &pTrack ) { } -void SampleHandle::Enter(bool) +void SampleHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h index 13793d9d6..05e4edfe8 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SampleHandle.h @@ -44,7 +44,7 @@ public: std::shared_ptr GetTrack() const { return mClickedTrack; } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp index 113b5d740..0a948c199 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp @@ -32,7 +32,7 @@ SpectrumVZoomHandle::SpectrumVZoomHandle SpectrumVZoomHandle::~SpectrumVZoomHandle() = default; -void SpectrumVZoomHandle::Enter(bool) +void SpectrumVZoomHandle::Enter( bool, AudacityProject* ) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h index 1fbf566f8..d97b596a4 100644 --- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.h @@ -36,7 +36,7 @@ public: std::shared_ptr GetTrack() const { return mpTrack.lock(); } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject*) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp index 7ac1ae2cf..0786babf2 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp @@ -31,7 +31,7 @@ WaveformVZoomHandle::WaveformVZoomHandle( WaveformVZoomHandle::~WaveformVZoomHandle() = default; -void WaveformVZoomHandle::Enter(bool) +void WaveformVZoomHandle::Enter( bool, AudacityProject* ) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h index 544910c87..5fd56fb59 100644 --- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h +++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.h @@ -36,7 +36,7 @@ public: std::shared_ptr GetTrack() const { return mpTrack.lock(); } - void Enter(bool forward) override; + void Enter( bool forward, AudacityProject * ) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/ui/ButtonHandle.cpp b/src/tracks/ui/ButtonHandle.cpp index 81b1c4f2f..1fb78b093 100644 --- a/src/tracks/ui/ButtonHandle.cpp +++ b/src/tracks/ui/ButtonHandle.cpp @@ -27,7 +27,7 @@ ButtonHandle::~ButtonHandle() { } -void ButtonHandle::Enter(bool) +void ButtonHandle::Enter(bool, AudacityProject *) { mChangeHighlight = RefreshCode::RefreshCell; } diff --git a/src/tracks/ui/ButtonHandle.h b/src/tracks/ui/ButtonHandle.h index b670cd5d8..42c82295f 100644 --- a/src/tracks/ui/ButtonHandle.h +++ b/src/tracks/ui/ButtonHandle.h @@ -48,7 +48,7 @@ protected: // Define a message for the status bar and tooltip. virtual TranslatableString Tip(const wxMouseState &state) const = 0; - void Enter(bool forward) final override; + void Enter(bool forward, AudacityProject *) final override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) diff --git a/src/tracks/ui/EnvelopeHandle.cpp b/src/tracks/ui/EnvelopeHandle.cpp index 83555ff4d..e2da9614c 100644 --- a/src/tracks/ui/EnvelopeHandle.cpp +++ b/src/tracks/ui/EnvelopeHandle.cpp @@ -34,7 +34,7 @@ EnvelopeHandle::EnvelopeHandle( Envelope *pEnvelope ) { } -void EnvelopeHandle::Enter(bool) +void EnvelopeHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/ui/EnvelopeHandle.h b/src/tracks/ui/EnvelopeHandle.h index e3139c7a9..609a16bf1 100644 --- a/src/tracks/ui/EnvelopeHandle.h +++ b/src/tracks/ui/EnvelopeHandle.h @@ -55,7 +55,7 @@ public: Envelope *GetEnvelope() const { return mEnvelope; } - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/ui/SelectHandle.cpp b/src/tracks/ui/SelectHandle.cpp index 4f8a075d3..b4ccfe2e5 100644 --- a/src/tracks/ui/SelectHandle.cpp +++ b/src/tracks/ui/SelectHandle.cpp @@ -487,7 +487,7 @@ namespace { } } -void SelectHandle::Enter(bool) +void SelectHandle::Enter(bool, AudacityProject *) { SetUseSnap(true); } @@ -521,7 +521,7 @@ bool SelectHandle::HasEscape() const return HasSnap() && mUseSnap; } -bool SelectHandle::Escape() +bool SelectHandle::Escape(AudacityProject *) { if (SelectHandle::HasEscape()) { SetUseSnap(false); diff --git a/src/tracks/ui/SelectHandle.h b/src/tracks/ui/SelectHandle.h index 2e6f7052c..43fdb9f56 100644 --- a/src/tracks/ui/SelectHandle.h +++ b/src/tracks/ui/SelectHandle.h @@ -50,13 +50,13 @@ public: bool IsClicked() const; - void SetUseSnap(bool use); - void Enter(bool forward) override; + void SetUseSnap(bool use, AudacityProject *project); + void Enter(bool forward, AudacityProject *) override; bool HasSnap() const; bool HasEscape() const override; - bool Escape() override; + bool Escape(AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override; diff --git a/src/tracks/ui/SliderHandle.cpp b/src/tracks/ui/SliderHandle.cpp index 6b8149479..acd8de088 100644 --- a/src/tracks/ui/SliderHandle.cpp +++ b/src/tracks/ui/SliderHandle.cpp @@ -25,7 +25,7 @@ SliderHandle::SliderHandle { } -void SliderHandle::Enter(bool) +void SliderHandle::Enter(bool, AudacityProject *) { mChangeHighlight = RefreshCode::RefreshCell; } diff --git a/src/tracks/ui/SliderHandle.h b/src/tracks/ui/SliderHandle.h index 981875f4e..40a7ce31f 100644 --- a/src/tracks/ui/SliderHandle.h +++ b/src/tracks/ui/SliderHandle.h @@ -45,7 +45,7 @@ protected: virtual Result CommitChanges (const wxMouseEvent &event, AudacityProject *pProject) = 0; - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) diff --git a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp index 4dfe8d31f..368caecf0 100644 --- a/src/tracks/ui/TimeShiftHandle.cpp +++ b/src/tracks/ui/TimeShiftHandle.cpp @@ -37,7 +37,7 @@ TimeShiftHandle::TimeShiftHandle { } -void TimeShiftHandle::Enter(bool) +void TimeShiftHandle::Enter(bool, AudacityProject *) { #ifdef EXPERIMENTAL_TRACK_PANEL_HIGHLIGHTING mChangeHighlight = RefreshCode::RefreshCell; diff --git a/src/tracks/ui/TimeShiftHandle.h b/src/tracks/ui/TimeShiftHandle.h index fd8bf7a48..556df7121 100644 --- a/src/tracks/ui/TimeShiftHandle.h +++ b/src/tracks/ui/TimeShiftHandle.h @@ -84,7 +84,7 @@ public: virtual ~TimeShiftHandle(); - void Enter(bool forward) override; + void Enter(bool forward, AudacityProject *) override; Result Click (const TrackPanelMouseEvent &event, AudacityProject *pProject) override;