Remove Sequence.h from other headers

src/AutoRecovery.cpp

@@ -19,6 +19,7 @@ recover previous Audacity projects that were closed incorrectly.
 #include "AudacityApp.h"
 #include "FileNames.h"
 #include "blockfile/SimpleBlockFile.h"
+#include "Sequence.h"
 #include "ShuttleGui.h"
 
 #include <wx/wxprec.h>

src/Dependencies.cpp

@@ -36,6 +36,7 @@
 #include "Internat.h"
 #include "Prefs.h"
 #include "Project.h"
+#include "Sequence.h"
 #include "ShuttleGui.h"
 #include "WaveTrack.h"
 #include "WaveClip.h"

src/FFmpeg.h

@@ -128,6 +128,8 @@ extern "C" {
 #endif
 
 #include "Audacity.h"
+#include "Experimental.h"
+
 /* rather earlier than normal, but pulls in config*.h and other program stuff
  * we need for the next bit */
 #include <wx/string.h>
@@ -141,10 +143,8 @@ extern "C" {
 #include "Prefs.h"
 #include <wx/checkbox.h>
 #include <wx/textctrl.h>
-// needed for sampleCount
-#include "Sequence.h"
 
-#include "Experimental.h"
+#include "audacity/Types.h"
 
 // if you needed them, any other audacity header files would go here
 

src/Project.cpp

@@ -110,6 +110,7 @@ scroll information.  It also has some status flags.
 #include "Mix.h"
 #include "NoteTrack.h"
 #include "Prefs.h"
+#include "Sequence.h"
 #include "Snap.h"
 #include "Tags.h"
 #include "TimeTrack.h"

src/TrackArtist.cpp

@@ -175,7 +175,6 @@ audio tracks.
 #include "Prefs.h"
 #include "prefs/SpectrogramSettings.h"
 #include "prefs/WaveformSettings.h"
-#include "Sequence.h"
 #include "Spectrum.h"
 #include "ViewInfo.h"
 #include "widgets/Ruler.h"

src/TrackPanel.h

@@ -21,7 +21,7 @@
 #include <wx/window.h>
 
 #include "Experimental.h"
-#include "Sequence.h"  //Stm: included for the sampleCount declaration
+#include "audacity/Types.h"
 #include "UndoManager.h" //JKC: Included for PUSH_XXX definitions.
 #include "widgets/NumericTextCtrl.h"
 

src/WaveClip.cpp

@@ -27,6 +27,7 @@
 #include <vector>
 #include <wx/log.h>
 
+#include "Sequence.h"
 #include "Spectrum.h"
 #include "Prefs.h"
 #include "Envelope.h"
@@ -368,6 +369,11 @@ bool WaveClip::SetSamples(samplePtr buffer, sampleFormat format,
    return bResult;
 }
 
+BlockArray* WaveClip::GetSequenceBlockArray()
+{
+   return mSequence->GetBlockArray();
+}
+
 double WaveClip::GetStartTime() const
 {
    // JS: mOffset is the minimum value and it is returned; no clipping to 0
@@ -395,6 +401,11 @@ sampleCount WaveClip::GetEndSample() const
    return GetStartSample() + mSequence->GetNumSamples();
 }
 
+sampleCount WaveClip::GetNumSamples() const
+{
+   return mSequence->GetNumSamples();
+}
+
 bool WaveClip::WithinClip(double t) const
 {
    sampleCount ts = (sampleCount)floor(t * mRate + 0.5);

src/WaveClip.h

@@ -14,7 +14,6 @@
 
 #include "Audacity.h"
 #include "SampleFormat.h"
-#include "Sequence.h"
 #include "widgets/ProgressDialog.h"
 #include "ondemand/ODTaskThread.h"
 #include "xml/XMLTagHandler.h"
@@ -31,7 +30,10 @@
 
 #include <vector>
 
+class BlockArray;
+class DirManager;
 class Envelope;
+class Sequence;
 class SpectrogramSettings;
 class WaveCache;
 class WaveTrackCache;
@@ -249,7 +251,7 @@ public:
    double GetEndTime() const;
    sampleCount GetStartSample() const;
    sampleCount GetEndSample() const;
-   sampleCount GetNumSamples() const { return mSequence->GetNumSamples(); }
+   sampleCount GetNumSamples() const;
 
    // One and only one of the following is true for a given t (unless the clip
    // has zero length -- then BeforeClip() and AfterClip() can both be true).
@@ -264,7 +266,7 @@ public:
                    sampleCount start, sampleCount len);
 
    Envelope* GetEnvelope() { return mEnvelope; }
-   BlockArray* GetSequenceBlockArray() { return mSequence->GetBlockArray(); }
+   BlockArray* GetSequenceBlockArray();
 
    // Get low-level access to the sequence. Whenever possible, don't use this,
    // but use more high-level functions inside WaveClip (or add them if you

src/WaveTrack.h

@@ -13,7 +13,6 @@
 
 #include "Track.h"
 #include "SampleFormat.h"
-#include "Sequence.h"
 #include "WaveClip.h"
 #include "Experimental.h"
 #include "widgets/ProgressDialog.h"

src/ondemand/ODComputeSummaryTask.cpp

@@ -20,6 +20,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data.
 
 #include "ODComputeSummaryTask.h"
 #include "../blockfile/ODPCMAliasBlockFile.h"
+#include "../Sequence.h"
 #include "../WaveTrack.h"
 #include <wx/wx.h>
 

src/ondemand/ODDecodeTask.cpp

@@ -18,6 +18,7 @@ updating the ODPCMAliasBlockFile and the GUI of the newly available data.
 
 #include "ODDecodeTask.h"
 #include "../blockfile/ODDecodeBlockFile.h"
+#include "../Sequence.h"
 #include "../WaveTrack.h"
 #include <wx/wx.h>
 

src/toolbars/TranscriptionToolBar.cpp

@@ -15,6 +15,7 @@
 *//*******************************************************************/
 
 #include "../Audacity.h"
+#include "TranscriptionToolBar.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include <wx/wxprec.h>
@@ -28,7 +29,6 @@
 #endif // WX_PRECOMP
 
 #include "../Envelope.h"
-#include "TranscriptionToolBar.h"
 
 #include "ControlToolBar.h"
 #include "../AudacityApp.h"

src/toolbars/TranscriptionToolBar.h

@@ -18,7 +18,7 @@
 #include <wx/brush.h>
 #include <wx/pen.h>
 
-#include "../Sequence.h"
+#include "audacity/Types.h"
 #include "../Theme.h"
 
 class wxBitmap;
@@ -82,7 +82,7 @@ class TranscriptionToolBar:public ToolBar {
    virtual void OnSensitivitySlider(wxCommandEvent & event);
 
    virtual void Populate();
-   virtual void Repaint(wxDC * WXUNUSED(dc)) {};
+   virtual void Repaint(wxDC * WXUNUSED(dc)) {}
    virtual void EnableDisableButtons();
    virtual void UpdatePrefs();
 

src/widgets/Meter.h

@@ -21,7 +21,6 @@
 #include <wx/timer.h>
 
 #include "../SampleFormat.h"
-#include "../Sequence.h"
 #include "Ruler.h"
 
 // Event used to notify all meters of preference changes
@@ -57,8 +56,8 @@ class MeterUpdateMsg
    int tailPeakCount[kMaxMeterBars];
 
    /* neither constructor nor destructor do anything */
-   MeterUpdateMsg() { };
+   MeterUpdateMsg() { }
-   ~MeterUpdateMsg() { };
+   ~MeterUpdateMsg() { }
    /* for debugging purposes, printing the values out is really handy */
    /** \brief Print out all the values in the meter update message */
    wxString toString();

src/widgets/NumericTextCtrl.cpp

@@ -166,9 +166,9 @@ different formats.
 
 
 #include "../Audacity.h"
-#include "../AudacityApp.h"
 #include "NumericTextCtrl.h"
-#include "../Sequence.h"   // for sampleCount
+#include "audacity/Types.h"
+#include "../AudacityApp.h"
 #include "../Theme.h"
 #include "../AllThemeResources.h"
 #include "../AColor.h"