From d69a76dc6ff795f6d44e57cc4d863557dd84186f Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Tue, 4 Jun 2019 12:47:44 -0400
Subject: [PATCH] ProjectSettings.cpp does not depend on Snap, is free of
 cycles

---
 src/ProjectSettings.cpp       | 2 +-
 src/ProjectSettings.h         | 7 +++++++
 src/Snap.h                    | 7 -------
 src/toolbars/SelectionBar.cpp | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/ProjectSettings.cpp b/src/ProjectSettings.cpp
index 6228bf37a..a1677f34d 100644
--- a/src/ProjectSettings.cpp
+++ b/src/ProjectSettings.cpp
@@ -14,8 +14,8 @@ Paul Licameli split from AudacityProject.cpp
 
 #include "AudioIOBase.h"
 #include "Project.h"
-#include "Snap.h"
 #include "prefs/QualityPrefs.h"
+#include "widgets/NumericTextCtrl.h"
 
 wxDEFINE_EVENT(EVT_PROJECT_SETTINGS_CHANGE, wxCommandEvent);
 
diff --git a/src/ProjectSettings.h b/src/ProjectSettings.h
index 081be0138..15f89d2fc 100644
--- a/src/ProjectSettings.h
+++ b/src/ProjectSettings.h
@@ -22,6 +22,13 @@ class AudacityProject;
 wxDECLARE_EXPORTED_EVENT(AUDACITY_DLL_API,
    EVT_PROJECT_SETTINGS_CHANGE, wxCommandEvent);
 
+enum
+{
+   SNAP_OFF,
+   SNAP_NEAREST,
+   SNAP_PRIOR
+};
+
 ///\brief Holds various per-project settings values, including the sample rate,
 /// and sends events to the project when certain values change
 class ProjectSettings final
diff --git a/src/Snap.h b/src/Snap.h
index 1208205b5..ef19f85d1 100644
--- a/src/Snap.h
+++ b/src/Snap.h
@@ -47,13 +47,6 @@ public:
 
 class TrackClipArray : public std::vector < TrackClip > {};
 
-enum
-{
-   SNAP_OFF,
-   SNAP_NEAREST,
-   SNAP_PRIOR
-};
-
 const int kPixelTolerance = 4;
 
 class SnapPoint
diff --git a/src/toolbars/SelectionBar.cpp b/src/toolbars/SelectionBar.cpp
index ba8404a7b..39d078817 100644
--- a/src/toolbars/SelectionBar.cpp
+++ b/src/toolbars/SelectionBar.cpp
@@ -56,6 +56,7 @@ with changes in the SelectionBar.
 #include "../AColor.h"
 #include "../KeyboardCapture.h"
 #include "../Prefs.h"
+#include "../ProjectSettings.h"
 #include "../Snap.h"
 #include "../AllThemeResources.h"