smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 13:45:43 +01:00
Code Issues Projects Releases Wiki Activity

Merged with trunk R992.

Browse source 
Completely untested other than it compiles, runs, and records somewhat (need to merge again).


git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2006-10-21 19:01:50 +00:00
parent 7bd41538d9
commit fedf3d34f3
297 changed files with 6156 additions and 5481 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/automation_line.h
View file

@ -96,7 +96,7 @@ class ControlPoint
ShapeType _shape;
};
class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
class AutomationLine : public PBD::StatefulDestructible
{
public:
AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
@ -107,7 +107,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
void clear();
void set_selected_points (PointSelection&);
void get_selectables (jack_nframes_t& start, jack_nframes_t& end,
void get_selectables (nframes_t& start, nframes_t& end,
double botfrac, double topfrac,
list<Selectable*>& results);
void get_inverted_selectables (Selection&, list<Selectable*>& results);
@ -118,7 +118,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
/* dragging API */
virtual void start_drag (ControlPoint*, float fraction);
virtual void point_drag(ControlPoint&, jack_nframes_t x, float, bool with_push);
virtual void point_drag(ControlPoint&, nframes_t x, float, bool with_push);
virtual void end_drag (ControlPoint*);
virtual void line_drag(uint32_t i1, uint32_t i2, float, bool with_push);
@ -224,13 +224,13 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
struct ModelRepresentation {
ARDOUR::AutomationList::iterator start;
ARDOUR::AutomationList::iterator end;
jack_nframes_t xpos;
nframes_t xpos;
double ypos;
jack_nframes_t xmin;
nframes_t xmin;
double ymin;
jack_nframes_t xmax;
nframes_t xmax;
double ymax;
jack_nframes_t xval;
nframes_t xval;
double yval;
};