From 1b05ba9a78fa270d08e773dd714d4b55c7dfeb75 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Fri, 19 Oct 2018 08:51:13 -0400
Subject: [PATCH] A compile-time constant for the number of align menu items

---
 src/Menus.cpp | 15 ++++++++++-----
 src/Menus.h   |  2 --
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index d8d2f6591..8429cf9d4 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -167,6 +167,8 @@ static void AddEffectMenuItemGroup(CommandManager *c,
    bool isDefault);
 static void CreateRecentFilesMenu(CommandManager *c);
 
+constexpr size_t kAlignLabelsCount = 5;
+
 MenuCommandHandler &GetMenuCommandHandler(AudacityProject &project)
 { return *project.mMenuCommandHandler; }
 
@@ -1156,7 +1158,10 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
          { wxT("EndToSelStart"),   _("End to Cu&rsor/Selection Start") },
          { wxT("EndToSelEnd"),     _("End to Selection En&d") },
       };
-      mAlignLabelsCount = sizeof(alignLabels) / sizeof(alignLabels[0]);
+      static_assert(
+         kAlignLabelsCount == sizeof(alignLabels) / sizeof(alignLabels[0]),
+         "incorrect count"
+      );
 
       c->BeginSubMenu(_("&Align Tracks"));
 
@@ -1164,7 +1169,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
       c->AddItemList(wxT("Align"), alignLabelsNoSync, 2u, FN(OnAlignNoSync),
          AudioIONotBusyFlag | TracksSelectedFlag);
       c->AddSeparator();
-      c->AddItemList(wxT("Align"), alignLabels, mAlignLabelsCount, FN(OnAlign),
+      c->AddItemList(wxT("Align"), alignLabels, kAlignLabelsCount, FN(OnAlign),
          AudioIONotBusyFlag | TracksSelectedFlag);
       c->AddSeparator();
       c->AddItem( wxT("MoveSelectionWithTracks"), XXO("&Move Selection with Tracks (on/off)"),
@@ -1177,7 +1182,7 @@ void MenuCreator::CreateMenusAndCommands(AudacityProject &project)
       // TODO: Can these labels be made clearer? Do we need this sub-menu at all?
       c->BeginSubMenu(_("Move Sele&ction and Tracks"));
 
-      c->AddItemList(wxT("AlignMove"), alignLabels, mAlignLabelsCount, FN(OnAlignMoveSel));
+      c->AddItemList(wxT("AlignMove"), alignLabels, kAlignLabelsCount, FN(OnAlignMoveSel));
       c->SetCommandFlags(wxT("AlignMove"),
          AudioIONotBusyFlag | TracksSelectedFlag,
          AudioIONotBusyFlag | TracksSelectedFlag);
@@ -8517,7 +8522,7 @@ void MenuCommandHandler::HandleAlign
          : _("Align Together");
    }
 
-   if ((unsigned)index >= GetMenuManager(project).mAlignLabelsCount) { // This is an alignLabelsNoSync command.
+   if ((unsigned)index >= kAlignLabelsCount) { // This is an alignLabelsNoSync command.
       for (auto t : tracks->SelectedLeaders< AudioTrack >()) {
          // This shifts different tracks in different ways, so no sync-lock move.
          // Only align Wave and Note tracks end to end.
@@ -8558,7 +8563,7 @@ void MenuCommandHandler::OnAlignNoSync(const CommandContext &context)
 
    // Add length of alignLabels array so that we can handle this in AudacityProject::HandleAlign.
    HandleAlign(project,
-      context.index + GetMenuManager(project).mAlignLabelsCount, false);
+      context.index + kAlignLabelsCount, false);
 }
 
 void MenuCommandHandler::OnAlign(const CommandContext &context)
diff --git a/src/Menus.h b/src/Menus.h
index 7552d6067..49e3132d8 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -609,8 +609,6 @@ public:
    
    // Last effect applied to this project
    PluginID mLastEffect{};
-
-   size_t mAlignLabelsCount;
 };
 
 class MenuManager : public MenuCreator