From ca5bb78abe107f3bd3ba40683e97aacb87783da2 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 27 Mar 2019 04:24:36 -0400
Subject: [PATCH] Remove AudacityProject::GetSelection

---
 src/Project.h                       | 2 --
 src/menus/PluginMenus.cpp           | 2 +-
 src/menus/SelectMenus.cpp           | 2 +-
 src/menus/TransportMenus.cpp        | 2 +-
 src/tracks/ui/EditCursorOverlay.cpp | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Project.h b/src/Project.h
index 701045630..e9aa4feab 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -218,8 +218,6 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
    double GetRate() const { return mRate; }
    bool ZoomInAvailable() const { return mViewInfo.ZoomInAvailable(); }
    bool ZoomOutAvailable() const { return mViewInfo.ZoomOutAvailable(); }
-   const SelectedRegion &GetSelection() const { return mViewInfo.selectedRegion; }
-   SelectedRegion &GetSelection() { return mViewInfo.selectedRegion; }
    const ZoomInfo &GetZoomInfo() const { return mViewInfo; }
    const ViewInfo &GetViewInfo() const { return mViewInfo; }
    ViewInfo &GetViewInfo() { return mViewInfo; }
diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index 4afdff6a1..b77784d5a 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -394,7 +394,7 @@ bool DoEffect(
    auto trackPanel = project.GetTrackPanel();
    auto trackFactory = project.GetTrackFactory();
    auto rate = project.GetRate();
-   auto &selectedRegion = project.GetSelection();
+   auto &selectedRegion = project.GetViewInfo().selectedRegion;
    auto commandManager = project.GetCommandManager();
 
    const PluginDescriptor *plug = PluginManager::Get().GetPlugin(ID);
diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp
index 3ebf595f9..e74f53445 100644
--- a/src/menus/SelectMenus.cpp
+++ b/src/menus/SelectMenus.cpp
@@ -735,7 +735,7 @@ void OnToggleSpectralSelection(const CommandContext &context)
 {
    auto &project = context.project;
    auto trackPanel = project.GetTrackPanel();
-   auto &selectedRegion = project.GetSelection();
+   auto &selectedRegion = project.GetViewInfo().selectedRegion;
 
    const double f0 = selectedRegion.f0();
    const double f1 = selectedRegion.f1();
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 88984813a..943c295bd 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -154,7 +154,7 @@ void DoMoveToLabel(AudacityProject &project, bool next)
 
    // If there is a single label track, or there is a label track at or below
    // the focused track
-   auto &selectedRegion = project.GetSelection();
+   auto &selectedRegion = project.GetViewInfo().selectedRegion;
    if (lt) {
       int i;
       if (next)
diff --git a/src/tracks/ui/EditCursorOverlay.cpp b/src/tracks/ui/EditCursorOverlay.cpp
index 97af38ea6..b587a6b19 100644
--- a/src/tracks/ui/EditCursorOverlay.cpp
+++ b/src/tracks/ui/EditCursorOverlay.cpp
@@ -40,7 +40,7 @@ EditCursorOverlay::EditCursorOverlay(AudacityProject *project, bool isMaster)
 
 std::pair<wxRect, bool> EditCursorOverlay::DoGetRectangle(wxSize size)
 {
-   const SelectedRegion &selection = mProject->GetSelection();
+   const auto &selection = mProject->GetViewInfo().selectedRegion;
    if (!selection.isPoint()) {
       mCursorTime = -1.0;
       mNewCursorX = -1;