EXPERIMENTAL_MIDI_STRETCHING redone with constexpr if

Paul-Licameli · Apr 15, 2024 · d813f42 · d813f42
1 parent 21cbb07
commit d813f42
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/Experimental.cmake b/src/Experimental.cmake
@@ -32,13 +32,6 @@ set( EXPERIMENTAL_OPTIONS_LIST
    # EQ accelerated code
    #EQ_SSE_THREADED
 
-   # JKC, 17 Aug 2017
-   # Enables the MIDI note stretching feature, which currently
-   # a) Is broken on Linux (Bug 1646)
-   # b) Crashes with Sync-Lock (Bug 1719)
-   # c) Needs UI design review.
-   #MIDI_STRETCHING
-
    # USE_MIDI must be defined in order for SCOREALIGN to work
    #SCOREALIGN
 

diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.cpp
@@ -41,6 +41,18 @@ NoteTrackView::~NoteTrackView()
 {
 }
 
+namespace Experimental {
+/*
+ JKC, 17 Aug 2017
+ Enables the MIDI note stretching feature, which currently
+ a) Is broken on Linux (Bug 1646)
+ b) Crashes with Sync-Lock (Bug 1719)
+ c) Needs UI design review.
+ PRL:  But treat this with respect.  It's one of Roger's!
+ */
+constexpr bool MidiStretching = false;
+}
+
 std::vector<UIHandlePtr> NoteTrackView::DetailedHitTest(
    const TrackPanelMouseState &state, const AudacityProject *pProject,
    int, bool )
@@ -49,12 +61,12 @@ std::vector<UIHandlePtr> NoteTrackView::DetailedHitTest(
    UIHandlePtr result;
    std::vector<UIHandlePtr> results;
 #ifdef USE_MIDI
-#ifdef EXPERIMENTAL_MIDI_STRETCHING
-   result = StretchHandle::HitTest(
-      mStretchHandle, state, pProject, FindChannel<NoteTrack>());
-   if (result)
-      results.push_back(result);
-#endif
+   if constexpr (Experimental::MidiStretching) {
+      result = StretchHandle::HitTest(
+         mStretchHandle, state, pProject, FindChannel<NoteTrack>());
+      if (result)
+         results.push_back(result);
+   }
 #endif
 
    return results;

diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h b/src/tracks/playabletrack/notetrack/ui/NoteTrackView.h
@@ -38,9 +38,6 @@ class NoteTrackView final : public CommonChannelView
       const wxRect &rect, unsigned iPass ) override;
 
    std::shared_ptr<CommonTrackCell> mpAffordanceCellControl;
-
-#ifdef EXPERIMENTAL_MIDI_STRETCHING
    std::weak_ptr<class StretchHandle> mStretchHandle;
-#endif
 };
 #endif