Merge big changes (mostly Controllable) from trunk

git-svn-id: svn://localhost/ardour2/branches/midi@682 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-07-14 03:43:32 +00:00
parent edd841895b
commit 50a3102b9b
230 changed files with 15646 additions and 22895 deletions

View file

@ -41,14 +41,14 @@ class AutomationTimeAxisView : public TimeAxisView {
~AutomationTimeAxisView();
void set_height (TimeAxisView::TrackHeight);
virtual void set_height (TimeAxisView::TrackHeight);
void set_samples_per_unit (double);
std::string name() const { return _name; }
virtual void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, jack_nframes_t, double) = 0;
void clear_lines ();
void add_line (AutomationLine&);
virtual void clear_lines ();
virtual void add_line (AutomationLine&);
vector<AutomationLine*> lines;