From a7d9e300380651679107767c12684126ca7f897c Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Tue, 17 Jun 2008 23:01:22 -0500 Subject: [PATCH] Cleanup includes. --- Timeline/Annotation_Region.C | 2 ++ Timeline/Audio_Region.C | 3 --- Timeline/Audio_Sequence.C | 1 + Timeline/Control_Point.C | 4 +++- Timeline/Control_Sequence.C | 5 +++-- Timeline/Project.C | 9 ++++----- Timeline/Sequence.C | 2 -- Timeline/Tempo_Point.C | 4 ++-- Timeline/Time_Point.C | 3 ++- Timeline/Timeline.C | 4 ---- Timeline/Track.C | 5 ++++- Timeline/Waveform.C | 12 ++++-------- 12 files changed, 25 insertions(+), 29 deletions(-) diff --git a/Timeline/Annotation_Region.C b/Timeline/Annotation_Region.C index 3ad5a88..c80a4b9 100644 --- a/Timeline/Annotation_Region.C +++ b/Timeline/Annotation_Region.C @@ -23,6 +23,8 @@ #include "Annotation_Region.H" + + void Annotation_Region::get ( Log_Entry &e ) const { diff --git a/Timeline/Audio_Region.C b/Timeline/Audio_Region.C index 593b6bc..17ab6bf 100644 --- a/Timeline/Audio_Region.C +++ b/Timeline/Audio_Region.C @@ -19,12 +19,9 @@ #include #include -#include #include -#include #include #include -#include #include "Sequence.H" #include "Audio_Region.H" diff --git a/Timeline/Audio_Sequence.C b/Timeline/Audio_Sequence.C index 0208b75..378c594 100644 --- a/Timeline/Audio_Sequence.C +++ b/Timeline/Audio_Sequence.C @@ -21,6 +21,7 @@ #include "Audio_Sequence.H" #include "Waveform.H" + #include using namespace std; diff --git a/Timeline/Control_Point.C b/Timeline/Control_Point.C index bb9331c..db03d6f 100644 --- a/Timeline/Control_Point.C +++ b/Timeline/Control_Point.C @@ -17,9 +17,11 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ +#include + #include "Control_Point.H" -#include + Control_Point::Control_Point ( Sequence *t, nframes_t when, float y ) { diff --git a/Timeline/Control_Sequence.C b/Timeline/Control_Sequence.C index fb7829c..fb85417 100644 --- a/Timeline/Control_Sequence.C +++ b/Timeline/Control_Sequence.C @@ -18,8 +18,6 @@ /*******************************************************************************/ #include -#include -using std::list; #include "Control_Sequence.H" #include "Track.H" @@ -27,6 +25,9 @@ using std::list; #include "Engine/Engine.H" // for lock() +#include +using std::list; + bool Control_Sequence::draw_with_gradient = true; diff --git a/Timeline/Project.C b/Timeline/Project.C index a8cc49f..d874266 100644 --- a/Timeline/Project.C +++ b/Timeline/Project.C @@ -18,8 +18,7 @@ /*******************************************************************************/ /* Routings for opening/closing/creation of projects. All the actual -project state belongs to Timeline and other classes. */ - + project state belongs to Timeline and other classes. */ #include #include @@ -38,6 +37,9 @@ project state belongs to Timeline and other classes. */ #include +#include "util/debug.h" +#include "util/file.h" + extern TLE *tle; /* FIXME: wrong place for this */ @@ -45,9 +47,6 @@ extern TLE *tle; #define PROJECT_VERSION "0.28.0" -#include "util/debug.h" -#include "util/file.h" - char Project::_name[256]; diff --git a/Timeline/Sequence.C b/Timeline/Sequence.C index 4127d8b..fd2edc9 100644 --- a/Timeline/Sequence.C +++ b/Timeline/Sequence.C @@ -21,8 +21,6 @@ #include "Sequence.H" #include "Timeline.H" -#include "Audio_Region.H" - #include #include "Track.H" diff --git a/Timeline/Tempo_Point.C b/Timeline/Tempo_Point.C index c133d4a..6581404 100644 --- a/Timeline/Tempo_Point.C +++ b/Timeline/Tempo_Point.C @@ -17,12 +17,12 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ - - #include "Tempo_Point.H" #include "Tempo_Sequence.H" #include "Timeline.H" // for timeline->tempo_track + + void Tempo_Point::get ( Log_Entry &e ) const { diff --git a/Timeline/Time_Point.C b/Timeline/Time_Point.C index edc12b4..6ab475d 100644 --- a/Timeline/Time_Point.C +++ b/Timeline/Time_Point.C @@ -17,11 +17,12 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ - #include "Time_Point.H" #include "Time_Sequence.H" #include "Timeline.H" // for timeline->time_track + + void Time_Point::get ( Log_Entry &e ) const { diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C index a553b12..a52a0dc 100644 --- a/Timeline/Timeline.C +++ b/Timeline/Timeline.C @@ -23,9 +23,6 @@ #include #include #include -#include - - #include #include "Timeline.H" @@ -41,7 +38,6 @@ #include "Engine/Engine.H" // for lock() - #include "FL/menu_popup.H" diff --git a/Timeline/Track.C b/Timeline/Track.C index 47d0ea8..7dff29a 100644 --- a/Timeline/Track.C +++ b/Timeline/Track.C @@ -26,7 +26,6 @@ #include "../FL/Fl_Sometimes_Input.H" #include #include -// #include #include #include "Engine/Engine.H" // for lock() @@ -34,10 +33,14 @@ #include "Control_Sequence.H" #include "Annotation_Sequence.H" + + int Track::_soloing = 0; const char *Track::capture_format = "Wav 24"; + + void Track::cb_input_field ( Fl_Widget *, void *v ) { diff --git a/Timeline/Waveform.C b/Timeline/Waveform.C index b4c7c7b..ae20234 100644 --- a/Timeline/Waveform.C +++ b/Timeline/Waveform.C @@ -17,31 +17,27 @@ /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /*******************************************************************************/ -#include - -#include -#include #include -#include "Timeline.H" - #include "Waveform.H" #include - #include using std::min; using std::max; + + bool Waveform::fill = true; bool Waveform::outline = true; bool Waveform::vary_color = true; bool Waveform::logarithmic = true; + + /* TODO: split the variations into separate functions. eg, plain, * outlined, filled, polygonal, rectified. */ - void Waveform::scale ( Peak *pbuf, int npeaks, float gain ) {