Remove WaveTrack.h from other headers

src/WaveTrack.h

@@ -22,6 +22,8 @@
 #include <wx/longlong.h>
 #include <wx/thread.h>
 
+#include "WaveTrackLocation.h"
+
 class SpectrogramSettings;
 class WaveformSettings;
 class TimeWarper;
@@ -53,7 +55,7 @@ WX_DEFINE_ARRAY( Region*, Regions );
 
 class Envelope;
 
-class AUDACITY_DLL_API WaveTrack: public Track {
+class AUDACITY_DLL_API WaveTrack : public Track {
 
  private:
 
@@ -79,22 +81,8 @@ class AUDACITY_DLL_API WaveTrack: public Track {
 #ifdef EXPERIMENTAL_OUTPUT_DISPLAY
    static bool mMonoAsVirtualStereo;
 #endif
-   enum LocationType {
-      locationCutLine = 1,
-      locationMergePoint
-   };
 
-   struct Location {
-      // Position of track location
-      double pos;
-
-      // Type of track location
-      LocationType typ;
-
-      // Only for typ==locationMergePoint
-      int clipidx1; // first clip (left one)
-      int clipidx2; // second clip (right one)
-   };
+   typedef WaveTrackLocation Location;
 
    virtual ~WaveTrack();
    virtual double GetOffset() const;
@@ -184,9 +172,6 @@ class AUDACITY_DLL_API WaveTrack: public Track {
    virtual bool Join       (double t0, double t1);
    virtual bool Disjoin    (double t0, double t1);
 
-   typedef bool ( WaveTrack::* EditFunction )( double, double );
-   typedef bool ( WaveTrack::* EditDestFunction )( double, double, Track** );
-
    virtual bool Trim (double t0, double t1);
 
    bool HandleClear(double t0, double t1, bool addCutLines, bool split);