Tidy.

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 1349efac4bd4ff8f9faf5ecb934b4bfefd3b058f..bc9c75e8f78c40fb24735ce948c2cebf56fb23b4 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_automation_line_h__
@@ -34,7 +33,7 @@
 #include <pbd/undo.h>
 #include <pbd/statefuldestructible.h> 
 
-#include <ardour/automation_event.h>
+#include <ardour/automation_list.h>
 
 
 using std::vector;
@@ -54,52 +53,10 @@ 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:
-        AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
+       AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr<ARDOUR::AutomationList>);
        virtual ~AutomationLine ();
 
        void queue_reset ();
@@ -128,13 +85,16 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        string  name() const { return _name; }
        bool    visible() const { return _visible; }
        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_height (guint32);
+       void    set_y_position_and_height (double, double);
        void    set_verbose_cursor_uses_gain_mapping (bool yn);
 
        TimeAxisView& trackview;
@@ -146,27 +106,32 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        void show_selection();
        void hide_selection ();
 
-       virtual string  get_verbose_cursor_string (float);
-       virtual void view_to_model_y (double&) = 0;
-       virtual void model_to_view_y (double&) = 0;
+       virtual string get_verbose_cursor_string (double);
+       virtual void view_to_model_y (double&);
+       virtual void model_to_view_y (double&);
 
-       ARDOUR::AutomationList& the_list() const { return alist; }
+       boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
 
        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 &);
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&);
+       void set_colors();
 
   protected:
 
        string _name;
+       guint32 _y_position;
        guint32 _height;
        uint32_t _line_color;
-       ARDOUR::AutomationList& alist;
+       boost::shared_ptr<ARDOUR::AutomationList> alist;
 
        bool    _visible  : 1;
        bool    _vc_uses_gain_mapping : 1;
@@ -200,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*);
@@ -213,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&);