Tidy.

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 3f01ae6cf938346679212c50cc659a0c36a17f01..bc9c75e8f78c40fb24735ce948c2cebf56fb23b4 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -33,7 +33,7 @@
 #include <pbd/undo.h>
 #include <pbd/statefuldestructible.h> 
 
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 
 
 using std::vector;
@@ -53,48 +53,6 @@ namespace Gnome {
        }
 }
 
-class ControlPoint 
-{
-  public:
-       ControlPoint (AutomationLine& al);
-       ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
-       virtual ~ControlPoint ();
-
-       enum ShapeType {
-               Full,
-               Start,
-               End
-       };
-       
-       void move_to (double x, double y, ShapeType);
-       void reset (double x, double y, ARDOUR::AutomationList::iterator, uint32_t, ShapeType);
-       double get_x() const { return _x; }
-       double get_y() const { return _y; }
-
-       void hide (); 
-       void show ();
-       void show_color (bool entered, bool hide_too);
-
-       void set_size (double);
-       void set_visible (bool);
-
-       ArdourCanvas::SimpleRect* item;
-       AutomationLine& line;
-       uint32_t view_index;
-       ARDOUR::AutomationList::iterator model;
-       bool can_slide;
-       bool selected;
-       
-  protected:
-       virtual bool event_handler (GdkEvent*);
-
-  private:
-       double _x;
-       double _y;
-       double _size;
-       ShapeType _shape;
-};
-
 class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway
 {
   public:
@@ -129,12 +87,14 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        guint32 height() const { return _height; }
        guint32 y_position() const { return _y_position; }
 
-       void         set_line_color (uint32_t);
+       void     set_line_color (uint32_t);
        uint32_t get_line_color() const { return _line_color; }
 
+       void set_interpolation(ARDOUR::AutomationList::InterpolationStyle style);
+
        void    show ();
        void    hide ();
-       void    set_y_position_and_height (uint32_t, uint32_t);
+       void    set_y_position_and_height (double, double);
        void    set_verbose_cursor_uses_gain_mapping (bool yn);
 
        TimeAxisView& trackview;
@@ -155,6 +115,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        void show_all_control_points ();
        void hide_all_but_selected_control_points ();
 
+       void track_entered();
+       void track_exited();
+
        bool is_last_point (ControlPoint &);
        bool is_first_point (ControlPoint &);
 
@@ -202,7 +165,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
        virtual void change_model_range (ARDOUR::AutomationList::iterator,ARDOUR::AutomationList::iterator, double delta, float ydelta);
 
-       void reset_callback (const ARDOUR::AutomationList&);
+       void reset_callback (const Evoral::ControlList&);
        void list_changed ();
 
        virtual bool event_handler (GdkEvent*);
@@ -215,6 +178,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        uint32_t line_drag_cp2;
        int64_t  drag_x;
        int64_t  drag_distance;
+       
+       ARDOUR::AutomationList::InterpolationStyle _interpolation;
 
        void modify_view_point(ControlPoint&, double, double, bool with_push);
        void reset_line_coords (ControlPoint&);