@@ -23,6 +23,8 @@ | |||||
#include "Annotation_Region.H" | #include "Annotation_Region.H" | ||||
void | void | ||||
Annotation_Region::get ( Log_Entry &e ) const | Annotation_Region::get ( Log_Entry &e ) const | ||||
{ | { | ||||
@@ -19,12 +19,9 @@ | |||||
#include <FL/fl_draw.H> | #include <FL/fl_draw.H> | ||||
#include <FL/Fl.H> | #include <FL/Fl.H> | ||||
#include <FL/Fl_Group.H> | |||||
#include <FL/Fl_Widget.H> | #include <FL/Fl_Widget.H> | ||||
#include <FL/Fl_Box.H> | |||||
#include <FL/Fl_Menu_Item.H> | #include <FL/Fl_Menu_Item.H> | ||||
#include <FL/fl_show_colormap.H> | #include <FL/fl_show_colormap.H> | ||||
#include <stdio.h> | |||||
#include "Sequence.H" | #include "Sequence.H" | ||||
#include "Audio_Region.H" | #include "Audio_Region.H" | ||||
@@ -21,6 +21,7 @@ | |||||
#include "Audio_Sequence.H" | #include "Audio_Sequence.H" | ||||
#include "Waveform.H" | #include "Waveform.H" | ||||
#include <list> | #include <list> | ||||
using namespace std; | using namespace std; | ||||
@@ -17,9 +17,11 @@ | |||||
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
#include <FL/fl_draw.H> | |||||
#include "Control_Point.H" | #include "Control_Point.H" | ||||
#include <FL/fl_draw.H> | |||||
Control_Point::Control_Point ( Sequence *t, nframes_t when, float y ) | Control_Point::Control_Point ( Sequence *t, nframes_t when, float y ) | ||||
{ | { | ||||
@@ -18,8 +18,6 @@ | |||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
#include <FL/fl_ask.H> | #include <FL/fl_ask.H> | ||||
#include <list> | |||||
using std::list; | |||||
#include "Control_Sequence.H" | #include "Control_Sequence.H" | ||||
#include "Track.H" | #include "Track.H" | ||||
@@ -27,6 +25,9 @@ using std::list; | |||||
#include "Engine/Engine.H" // for lock() | #include "Engine/Engine.H" // for lock() | ||||
#include <list> | |||||
using std::list; | |||||
bool Control_Sequence::draw_with_gradient = true; | bool Control_Sequence::draw_with_gradient = true; | ||||
@@ -18,8 +18,7 @@ | |||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
/* Routings for opening/closing/creation of projects. All the actual | /* 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 <stdio.h> | #include <stdio.h> | ||||
#include <stdlib.h> | #include <stdlib.h> | ||||
@@ -38,6 +37,9 @@ project state belongs to Timeline and other classes. */ | |||||
#include <FL/filename.H> | #include <FL/filename.H> | ||||
#include "util/debug.h" | |||||
#include "util/file.h" | |||||
extern TLE *tle; | extern TLE *tle; | ||||
/* FIXME: wrong place for this */ | /* FIXME: wrong place for this */ | ||||
@@ -45,9 +47,6 @@ extern TLE *tle; | |||||
#define PROJECT_VERSION "0.28.0" | #define PROJECT_VERSION "0.28.0" | ||||
#include "util/debug.h" | |||||
#include "util/file.h" | |||||
char Project::_name[256]; | char Project::_name[256]; | ||||
@@ -21,8 +21,6 @@ | |||||
#include "Sequence.H" | #include "Sequence.H" | ||||
#include "Timeline.H" | #include "Timeline.H" | ||||
#include "Audio_Region.H" | |||||
#include <FL/fl_draw.H> | #include <FL/fl_draw.H> | ||||
#include "Track.H" | #include "Track.H" | ||||
@@ -17,12 +17,12 @@ | |||||
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
#include "Tempo_Point.H" | #include "Tempo_Point.H" | ||||
#include "Tempo_Sequence.H" | #include "Tempo_Sequence.H" | ||||
#include "Timeline.H" // for timeline->tempo_track | #include "Timeline.H" // for timeline->tempo_track | ||||
void | void | ||||
Tempo_Point::get ( Log_Entry &e ) const | Tempo_Point::get ( Log_Entry &e ) const | ||||
{ | { | ||||
@@ -17,11 +17,12 @@ | |||||
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
#include "Time_Point.H" | #include "Time_Point.H" | ||||
#include "Time_Sequence.H" | #include "Time_Sequence.H" | ||||
#include "Timeline.H" // for timeline->time_track | #include "Timeline.H" // for timeline->time_track | ||||
void | void | ||||
Time_Point::get ( Log_Entry &e ) const | Time_Point::get ( Log_Entry &e ) const | ||||
{ | { | ||||
@@ -23,9 +23,6 @@ | |||||
#include <FL/Fl_Scrollbar.H> | #include <FL/Fl_Scrollbar.H> | ||||
#include <FL/Fl_Widget.H> | #include <FL/Fl_Widget.H> | ||||
#include <FL/fl_draw.H> | #include <FL/fl_draw.H> | ||||
#include <FL/Fl_Scrollbar.H> | |||||
#include <FL/Fl_Menu_Button.H> | #include <FL/Fl_Menu_Button.H> | ||||
#include "Timeline.H" | #include "Timeline.H" | ||||
@@ -41,7 +38,6 @@ | |||||
#include "Engine/Engine.H" // for lock() | #include "Engine/Engine.H" // for lock() | ||||
#include "FL/menu_popup.H" | #include "FL/menu_popup.H" | ||||
@@ -26,7 +26,6 @@ | |||||
#include "../FL/Fl_Sometimes_Input.H" | #include "../FL/Fl_Sometimes_Input.H" | ||||
#include <FL/fl_ask.H> | #include <FL/fl_ask.H> | ||||
#include <FL/Fl_Color_Chooser.H> | #include <FL/Fl_Color_Chooser.H> | ||||
// #include <FL/fl_draw.H> | |||||
#include <FL/Fl.H> | #include <FL/Fl.H> | ||||
#include "Engine/Engine.H" // for lock() | #include "Engine/Engine.H" // for lock() | ||||
@@ -34,10 +33,14 @@ | |||||
#include "Control_Sequence.H" | #include "Control_Sequence.H" | ||||
#include "Annotation_Sequence.H" | #include "Annotation_Sequence.H" | ||||
int Track::_soloing = 0; | int Track::_soloing = 0; | ||||
const char *Track::capture_format = "Wav 24"; | const char *Track::capture_format = "Wav 24"; | ||||
void | void | ||||
Track::cb_input_field ( Fl_Widget *, void *v ) | Track::cb_input_field ( Fl_Widget *, void *v ) | ||||
{ | { | ||||
@@ -17,31 +17,27 @@ | |||||
/* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | /* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ | ||||
/*******************************************************************************/ | /*******************************************************************************/ | ||||
#include <stdio.h> | |||||
#include <FL/Enumerations.H> | |||||
#include <FL/Fl.H> | |||||
#include <FL/fl_draw.H> | #include <FL/fl_draw.H> | ||||
#include "Timeline.H" | |||||
#include "Waveform.H" | #include "Waveform.H" | ||||
#include <math.h> | #include <math.h> | ||||
#include <algorithm> | #include <algorithm> | ||||
using std::min; | using std::min; | ||||
using std::max; | using std::max; | ||||
bool Waveform::fill = true; | bool Waveform::fill = true; | ||||
bool Waveform::outline = true; | bool Waveform::outline = true; | ||||
bool Waveform::vary_color = true; | bool Waveform::vary_color = true; | ||||
bool Waveform::logarithmic = true; | bool Waveform::logarithmic = true; | ||||
/* TODO: split the variations into separate functions. eg, plain, | /* TODO: split the variations into separate functions. eg, plain, | ||||
* outlined, filled, polygonal, rectified. */ | * outlined, filled, polygonal, rectified. */ | ||||
void | void | ||||
Waveform::scale ( Peak *pbuf, int npeaks, float gain ) | Waveform::scale ( Peak *pbuf, int npeaks, float gain ) | ||||
{ | { | ||||