From f1bec856752f57507735a374e28749a9f73db886 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Mon, 27 Mar 2017 00:44:54 -0400
Subject: [PATCH] use AudioTrack

---
 src/Menus.cpp                   | 24 ++++++++----------------
 src/toolbars/ControlToolBar.cpp |  6 +-----
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/src/Menus.cpp b/src/Menus.cpp
index b854edc52..9a6eb6ee5 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -4608,11 +4608,13 @@ bool AudacityProject::HandlePasteNothingSelected()
                pNewTrack = mTrackFactory->NewWaveTrack(w->GetSampleFormat(), w->GetRate());
             }
             break;
+
          #ifdef USE_MIDI
-            case Track::Note:
-               pNewTrack = mTrackFactory->NewNoteTrack();
-               break;
-            #endif // USE_MIDI
+         case Track::Note:
+            pNewTrack = mTrackFactory->NewNoteTrack();
+            break;
+         #endif // USE_MIDI
+
          case Track::Label:
             pNewTrack = mTrackFactory->NewLabelTrack();
             break;
@@ -6150,12 +6152,7 @@ void AudacityProject::HandleAlign(int index, bool moveSel)
 
    while (t) {
       // We only want Wave and Note tracks here.
-#if defined(USE_MIDI)
-      if (t->GetSelected() && ((t->GetKind() == Track::Wave) ||
-                               (t->GetKind() == Track::Note)))
-#else
-      if (t->GetSelected() && (t->GetKind() == Track::Wave))
-#endif
+      if (t->GetSelected() && dynamic_cast<const AudioTrack*>(t))
       {
          offset = t->GetOffset();
          if (t->GetLinked()) {   // Left channel of stereo track.
@@ -6236,12 +6233,7 @@ void AudacityProject::HandleAlign(int index, bool moveSel)
       while (t) {
          // This shifts different tracks in different ways, so no sync-lock move.
          // Only align Wave and Note tracks end to end.
-#if defined(USE_MIDI)
-         if (t->GetSelected() && ((t->GetKind() == Track::Wave) ||
-                                  (t->GetKind() == Track::Note)))
-#else
-         if (t->GetSelected() && (t->GetKind() == Track::Wave))
-#endif
+         if (t->GetSelected() && dynamic_cast<const AudioTrack*>(t))
          {
             t->SetOffset(newPos);   // Move the track
 
diff --git a/src/toolbars/ControlToolBar.cpp b/src/toolbars/ControlToolBar.cpp
index e9693d37d..6fc4b24c6 100644
--- a/src/toolbars/ControlToolBar.cpp
+++ b/src/toolbars/ControlToolBar.cpp
@@ -418,11 +418,7 @@ void ControlToolBar::EnableDisableButtons()
    if (p) {
       TrackListIterator iter( p->GetTracks() );
       for (Track *t = iter.First(); t; t = iter.Next()) {
-         if (t->GetKind() == Track::Wave
-#if defined(USE_MIDI)
-         || t->GetKind() == Track::Note
-#endif
-         ) {
+         if (dynamic_cast<const AudioTrack*>(t)) {
             tracks = true;
             break;
          }