From 9f377b3b75a2fa7ee3f6ef6f20771adfb3c23aed Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Sun, 5 May 2019 12:45:18 -0400
Subject: [PATCH] Prepare to decouple factories for TP & Ruler into their own
 sources

---
 src/Project.cpp | 25 ++++++++++++++++++++-----
 src/Project.h   |  7 +++++++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/Project.cpp b/src/Project.cpp
index 7eb5268f3..73048a9fc 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -1061,9 +1061,15 @@ enum {
 
    HSBarID,
    VSBarID,
-   TrackPanelID
+
+   NextID,
 };
 
+int AudacityProject::NextWindowID()
+{
+   return mNextWindowID++;
+}
+
 
 // PRL:  This event type definition used to be in AudacityApp.h, which created
 // a bad compilation dependency.  The event was never emitted anywhere.  I
@@ -1116,6 +1122,10 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
      mUndoManager(std::make_unique<UndoManager>())
      , mCommandManager( std::make_unique<CommandManager>() )
 {
+   auto &window = *this;
+
+   mNextWindowID = NextID;
+
    if (!gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), &mRate, AudioIO::GetOptimalSupportedSampleRate())) {
       // The default given above can vary with host/devices. So unless there is an entry for
       // the default sample rate in audacity.cfg, Audacity can open with a rate which is different
@@ -1215,7 +1225,7 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
    //
    // Create the horizontal ruler
    //
-   mRuler = safenew AdornedRulerPanel( this, mTopPanel,
+   mRuler = safenew AdornedRulerPanel( this, window.GetTopPanel(),
       wxID_ANY,
       wxDefaultPosition,
       wxSize( -1, AdornedRulerPanel::GetRulerHeight(false) ),
@@ -1262,6 +1272,8 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
    pPage->SetBackgroundColour(theTheme.Colour( clrMedium ));
 #endif
 
+   mMainPage = pPage;
+
    {
       auto ubs = std::make_unique<wxBoxSizer>(wxVERTICAL);
       ubs->Add(mToolManager->GetTopDock(), 0, wxEXPAND | wxALIGN_TOP);
@@ -1281,15 +1293,18 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
    }
    bs->Layout();
 
-   wxASSERT( pPage ); // to justify safenew
-   mTrackPanel = safenew TrackPanel(pPage,
-                                             TrackPanelID,
+   {
+   auto mainPage = window.GetMainPage();
+   wxASSERT( mainPage ); // to justify safenew
+   mTrackPanel = safenew TrackPanel(mainPage,
+                                             window.NextWindowID(),
                                              wxDefaultPosition,
                                              wxDefaultSize,
                                              mTracks,
                                              &mViewInfo,
                                              this,
                                              mRuler);
+   }
    mTrackPanel->UpdatePrefs();
 
    mCursorOverlay = std::make_shared<EditCursorOverlay>(this);
diff --git a/src/Project.h b/src/Project.h
index 99a5562ba..ad48dc6f9 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -191,6 +191,9 @@ class AUDACITY_DLL_API AudacityProject final : public wxFrame,
                    const wxPoint & pos, const wxSize & size);
    virtual ~AudacityProject();
 
+   // Next available ID for sub-windows
+   int NextWindowID();
+
    using AttachedObject = PrefsListener;
    using AttachedObjectFactory =
       std::function< std::unique_ptr<AttachedObject>() >;
@@ -327,6 +330,7 @@ public:
    bool GetDirty() { return mDirty; }
    void SetProjectTitle( int number =-1);
 
+   wxWindow *GetMainPage() { return mMainPage; }
    wxPanel *GetTopPanel() { return mTopPanel; }
    TrackPanel * GetTrackPanel() {return mTrackPanel;}
    const TrackPanel * GetTrackPanel() const {return mTrackPanel;}
@@ -614,6 +618,7 @@ private:
    TrackPanel *mTrackPanel{};
    SelectionState mSelectionState{};
    std::unique_ptr<TrackFactory> mTrackFactory{};
+   wxWindow * mMainPage;
    wxPanel * mMainPanel;
    wxScrollBar *mHsbar;
    wxScrollBar *mVsbar;
@@ -622,6 +627,8 @@ public:
    wxScrollBar &GetVerticalScrollBar() { return *mVsbar; }
 
 private:
+   int mNextWindowID;
+
    bool mAutoScrolling{ false };
    bool mActive{ true };
    bool mIconized;