1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-06-29 14:48:39 +02:00

Remove AudacityProject::GetSelection

This commit is contained in:
Paul Licameli 2019-03-27 04:24:36 -04:00
parent 4018b191b4
commit ca5bb78abe
5 changed files with 4 additions and 6 deletions

View File

@ -218,8 +218,6 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
double GetRate() const { return mRate; } double GetRate() const { return mRate; }
bool ZoomInAvailable() const { return mViewInfo.ZoomInAvailable(); } bool ZoomInAvailable() const { return mViewInfo.ZoomInAvailable(); }
bool ZoomOutAvailable() const { return mViewInfo.ZoomOutAvailable(); } 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 ZoomInfo &GetZoomInfo() const { return mViewInfo; }
const ViewInfo &GetViewInfo() const { return mViewInfo; } const ViewInfo &GetViewInfo() const { return mViewInfo; }
ViewInfo &GetViewInfo() { return mViewInfo; } ViewInfo &GetViewInfo() { return mViewInfo; }

View File

@ -394,7 +394,7 @@ bool DoEffect(
auto trackPanel = project.GetTrackPanel(); auto trackPanel = project.GetTrackPanel();
auto trackFactory = project.GetTrackFactory(); auto trackFactory = project.GetTrackFactory();
auto rate = project.GetRate(); auto rate = project.GetRate();
auto &selectedRegion = project.GetSelection(); auto &selectedRegion = project.GetViewInfo().selectedRegion;
auto commandManager = project.GetCommandManager(); auto commandManager = project.GetCommandManager();
const PluginDescriptor *plug = PluginManager::Get().GetPlugin(ID); const PluginDescriptor *plug = PluginManager::Get().GetPlugin(ID);

View File

@ -735,7 +735,7 @@ void OnToggleSpectralSelection(const CommandContext &context)
{ {
auto &project = context.project; auto &project = context.project;
auto trackPanel = project.GetTrackPanel(); auto trackPanel = project.GetTrackPanel();
auto &selectedRegion = project.GetSelection(); auto &selectedRegion = project.GetViewInfo().selectedRegion;
const double f0 = selectedRegion.f0(); const double f0 = selectedRegion.f0();
const double f1 = selectedRegion.f1(); const double f1 = selectedRegion.f1();

View File

@ -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 // If there is a single label track, or there is a label track at or below
// the focused track // the focused track
auto &selectedRegion = project.GetSelection(); auto &selectedRegion = project.GetViewInfo().selectedRegion;
if (lt) { if (lt) {
int i; int i;
if (next) if (next)

View File

@ -40,7 +40,7 @@ EditCursorOverlay::EditCursorOverlay(AudacityProject *project, bool isMaster)
std::pair<wxRect, bool> EditCursorOverlay::DoGetRectangle(wxSize size) std::pair<wxRect, bool> EditCursorOverlay::DoGetRectangle(wxSize size)
{ {
const SelectedRegion &selection = mProject->GetSelection(); const auto &selection = mProject->GetViewInfo().selectedRegion;
if (!selection.isPoint()) { if (!selection.isPoint()) {
mCursorTime = -1.0; mCursorTime = -1.0;
mNewCursorX = -1; mNewCursorX = -1;