From f81231efae9a727a0270639b3f71a295831628bf Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 5 Jul 2015 11:22:03 -0400 Subject: [PATCH] Remove Sequence.h from other headers --- src/AutoRecovery.cpp | 1 + src/Dependencies.cpp | 1 + src/FFmpeg.h | 6 +++--- src/Project.cpp | 1 + src/TrackArtist.cpp | 1 - src/TrackPanel.h | 2 +- src/WaveClip.cpp | 11 +++++++++++ src/WaveClip.h | 8 +++++--- src/WaveTrack.h | 1 - src/ondemand/ODComputeSummaryTask.cpp | 1 + src/ondemand/ODDecodeTask.cpp | 1 + src/toolbars/TranscriptionToolBar.cpp | 2 +- src/toolbars/TranscriptionToolBar.h | 4 ++-- src/widgets/Meter.h | 5 ++--- src/widgets/NumericTextCtrl.cpp | 4 ++-- 15 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/AutoRecovery.cpp b/src/AutoRecovery.cpp index df1d903bc..2f5430c92 100644 --- a/src/AutoRecovery.cpp +++ b/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 diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp index 1b5b1a92e..3a3df38e1 100644 --- a/src/Dependencies.cpp +++ b/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" diff --git a/src/FFmpeg.h b/src/FFmpeg.h index 79cd36261..aef40ae8b 100644 --- a/src/FFmpeg.h +++ b/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 @@ -141,10 +143,8 @@ extern "C" { #include "Prefs.h" #include #include -// 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 diff --git a/src/Project.cpp b/src/Project.cpp index 758476cdf..7d9d72999 100644 --- a/src/Project.cpp +++ b/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" diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp index 09acf210e..3119e5bac 100644 --- a/src/TrackArtist.cpp +++ b/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" diff --git a/src/TrackPanel.h b/src/TrackPanel.h index 0175c6a1b..7842b219d 100644 --- a/src/TrackPanel.h +++ b/src/TrackPanel.h @@ -21,7 +21,7 @@ #include #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" diff --git a/src/WaveClip.cpp b/src/WaveClip.cpp index 7062ebd2b..572bf676c 100644 --- a/src/WaveClip.cpp +++ b/src/WaveClip.cpp @@ -27,6 +27,7 @@ #include #include +#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); diff --git a/src/WaveClip.h b/src/WaveClip.h index 686472923..0beddc6dd 100644 --- a/src/WaveClip.h +++ b/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 +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 diff --git a/src/WaveTrack.h b/src/WaveTrack.h index b2d2b1229..61c063e36 100644 --- a/src/WaveTrack.h +++ b/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" diff --git a/src/ondemand/ODComputeSummaryTask.cpp b/src/ondemand/ODComputeSummaryTask.cpp index 32c9b0ad1..7bc0ca0c0 100644 --- a/src/ondemand/ODComputeSummaryTask.cpp +++ b/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 diff --git a/src/ondemand/ODDecodeTask.cpp b/src/ondemand/ODDecodeTask.cpp index 744f8f6d4..bd4f483ae 100644 --- a/src/ondemand/ODDecodeTask.cpp +++ b/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 diff --git a/src/toolbars/TranscriptionToolBar.cpp b/src/toolbars/TranscriptionToolBar.cpp index 9e71f691c..f99412584 100644 --- a/src/toolbars/TranscriptionToolBar.cpp +++ b/src/toolbars/TranscriptionToolBar.cpp @@ -15,6 +15,7 @@ *//*******************************************************************/ #include "../Audacity.h" +#include "TranscriptionToolBar.h" // For compilers that support precompilation, includes "wx/wx.h". #include @@ -28,7 +29,6 @@ #endif // WX_PRECOMP #include "../Envelope.h" -#include "TranscriptionToolBar.h" #include "ControlToolBar.h" #include "../AudacityApp.h" diff --git a/src/toolbars/TranscriptionToolBar.h b/src/toolbars/TranscriptionToolBar.h index 7a385173b..46af84a20 100644 --- a/src/toolbars/TranscriptionToolBar.h +++ b/src/toolbars/TranscriptionToolBar.h @@ -18,7 +18,7 @@ #include #include -#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(); diff --git a/src/widgets/Meter.h b/src/widgets/Meter.h index c97e0a011..55bfd7fa2 100644 --- a/src/widgets/Meter.h +++ b/src/widgets/Meter.h @@ -21,7 +21,6 @@ #include #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(); diff --git a/src/widgets/NumericTextCtrl.cpp b/src/widgets/NumericTextCtrl.cpp index 76da2b9df..71c16257c 100644 --- a/src/widgets/NumericTextCtrl.cpp +++ b/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"