From a7408a7f8017833ab3549fdee48cdd227c1abd78 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sat, 13 Jun 2020 11:20:45 -0400 Subject: [PATCH] Remove TimeWarper.h from other headers --- src/NoteTrack.cpp | 1 + src/NoteTrack.h | 2 +- src/effects/SoundTouchEffect.cpp | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/NoteTrack.cpp b/src/NoteTrack.cpp index ef9e27940..22b2c1257 100644 --- a/src/NoteTrack.cpp +++ b/src/NoteTrack.cpp @@ -38,6 +38,7 @@ #include "InconsistencyException.h" +#include "effects/TimeWarper.h" #include "tracks/ui/TrackView.h" #include "tracks/ui/TrackControls.h" diff --git a/src/NoteTrack.h b/src/NoteTrack.h index 18e030f41..f36fc5277 100644 --- a/src/NoteTrack.h +++ b/src/NoteTrack.h @@ -17,7 +17,6 @@ #include #include "Track.h" -#include "effects/TimeWarper.h" #if defined(USE_MIDI) @@ -63,6 +62,7 @@ using NoteTrackBase = using QuantizedTimeAndBeat = std::pair< double, double >; class StretchHandle; +class TimeWarper; class AUDACITY_DLL_API NoteTrack final : public NoteTrackBase diff --git a/src/effects/SoundTouchEffect.cpp b/src/effects/SoundTouchEffect.cpp index c3f1e0b3d..b81867eef 100644 --- a/src/effects/SoundTouchEffect.cpp +++ b/src/effects/SoundTouchEffect.cpp @@ -22,6 +22,7 @@ effect that uses SoundTouch to do its processing (ChangeTempo #include "../LabelTrack.h" #include "../WaveTrack.h" #include "../NoteTrack.h" +#include "TimeWarper.h" // Soundtouch defines these as well, which are also in generated configmac.h // and configunix.h, so get rid of them before including,