initial commit of hand merging, plus getting "ancient" waf script to work correctly

This commit is contained in:
Paul Davis 2013-04-04 00:32:52 -04:00
parent 1d8bac08c0
commit aaea166135
244 changed files with 131902 additions and 7357 deletions

View file

@ -25,10 +25,7 @@
#include <string>
#include <sys/types.h>
#include <libgnomecanvasmm/line.h>
#include <sigc++/signal.h>
#include "canvas.h"
#include "simplerect.h"
#include "evoral/TimeConverter.hpp"
@ -39,6 +36,10 @@
#include "ardour/automation_list.h"
#include "ardour/types.h"
#include "canvas/types.h"
#include "canvas/group.h"
#include "canvas/line.h"
class AutomationLine;
class ControlPoint;
class PointSelection;
@ -47,10 +48,8 @@ class AutomationTimeAxisView;
class Selectable;
class Selection;
namespace Gnome {
namespace Canvas {
class SimpleRect;
}
namespace ArdourCanvas {
class Rectangle;
}
/** A GUI representation of an ARDOUR::AutomationList */
@ -178,7 +177,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
ArdourCanvas::Group& _parent_group;
ArdourCanvas::Group* group;
ArdourCanvas::Line* line; /* line */
ArdourCanvas::PolyLine* line; /* line */
ArdourCanvas::Points line_points; /* coordinates for canvas line */
std::vector<ControlPoint*> control_points; /* visible control points */