diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 02:57:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2005-11-16 02:57:22 +0000 |
| commit | f16caf535c3e7a697c7464ecc153bce1b341d0ef (patch) | |
| tree | de359f3e2ef8d30d070cff3476bcea7d185596cb /gtk2_ardour/automation_line.h | |
| parent | adacfd9b24fb0ac7c4029cd659d21107eb7a2208 (diff) | |
get editor.cc to compile
git-svn-id: svn://localhost/trunk/ardour2@99 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.h')
| -rw-r--r-- | gtk2_ardour/automation_line.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index dbb920f52a..ed3ad05b16 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -55,9 +55,9 @@ namespace Gnome { class ControlPoint { public: - ControlPoint (AutomationLine& al, sigc::slot<bool,GdkEvent*,ControlPoint*>); + ControlPoint (AutomationLine& al); ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor); - ~ControlPoint (); + virtual ~ControlPoint (); enum ShapeType { Full, @@ -84,6 +84,9 @@ class ControlPoint bool can_slide; bool selected; + protected: + virtual bool event_handler (GdkEvent*); + private: double _x; double _y; @@ -94,9 +97,7 @@ class ControlPoint class AutomationLine : public sigc::trackable { public: - AutomationLine (string name, TimeAxisView&, Gnome::Canvas::Group&, ARDOUR::AutomationList&, - sigc::slot<bool,GdkEvent*,ControlPoint*>, sigc::slot<bool,GdkEvent*,AutomationLine*>); - + AutomationLine (string name, TimeAxisView&, Gnome::Canvas::Group&, ARDOUR::AutomationList&); virtual ~AutomationLine (); void queue_reset (); @@ -176,8 +177,6 @@ class AutomationLine : public sigc::trackable Gnome::Canvas::Points line_points; /* coordinates for canvas line */ vector<ControlPoint*> control_points; /* visible control points */ - sigc::slot<bool,GdkEvent*,ControlPoint*> point_slot; - struct ALPoint { double x; double y; @@ -202,6 +201,8 @@ class AutomationLine : public sigc::trackable void list_changed (ARDOUR::Change); UndoAction get_memento(); + + virtual bool event_handler (GdkEvent*); private: uint32_t drags; |