Another not-quite-there-but-better commit.

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index b73a1c548ab840f3787a5080cb62a1e052fd80ef..76653e7a5948347b8561074914037a191e9f41c6 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__
@@ -57,7 +56,7 @@ namespace Gnome {
 class ControlPoint 
 {
   public:
-        ControlPoint (AutomationLine& al);
+       ControlPoint (AutomationLine& al);
        ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor);
        virtual ~ControlPoint ();
 
@@ -99,7 +98,7 @@ class ControlPoint
 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 ();
@@ -117,7 +116,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        
        /* dragging API */
 
-       virtual void start_drag (ControlPoint*, float fraction);
+       virtual void start_drag (ControlPoint*, nframes_t x, float fraction);
        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);
@@ -128,13 +127,14 @@ 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);
        uint32_t get_line_color() const { return _line_color; }
 
        void    show ();
        void    hide ();
-       void    set_height (guint32);
+       void    set_y_position_and_height (uint32_t, uint32_t);
        void    set_verbose_cursor_uses_gain_mapping (bool yn);
 
        TimeAxisView& trackview;
@@ -147,10 +147,10 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        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 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 ();
@@ -160,13 +160,15 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
 
        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;
@@ -174,7 +176,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        bool    update_pending : 1;
        bool    no_draw : 1;
        bool    points_visible : 1;
-       
+       bool    did_push;
+
        ArdourCanvas::Group&  _parent_group;
        ArdourCanvas::Group*   group;
        ArdourCanvas::Line*   line; /* line */
@@ -193,10 +196,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        static bool invalid_point (ALPoints&, uint32_t index);
        
        void determine_visible_control_points (ALPoints&);
-       void sync_model_from (ControlPoint&);
-       void sync_model_with_view_point (ControlPoint&);
+       void sync_model_with_view_point (ControlPoint&, bool did_push, int64_t distance);
        void sync_model_with_view_line (uint32_t, uint32_t);
-       void modify_view (ControlPoint&, double, double, bool with_push);
        
        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);
@@ -212,10 +213,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        double   last_drag_fraction;
        uint32_t line_drag_cp1;
        uint32_t line_drag_cp2;
+       int64_t  drag_x;
+       int64_t  drag_distance;
 
        void modify_view_point(ControlPoint&, double, double, bool with_push);
        void reset_line_coords (ControlPoint&);
-       void update_line ();
 
        double control_point_box_size ();