fix #1637 (needs merging to 2.0.1 branch); remove debug printf

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index eb2d2045134ac9fb4c17aaa553b380dccdaf35ce..76afff5097a43cf62ce7359ac4bd0d29de5637be 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__
@@ -96,7 +95,7 @@ class ControlPoint
        ShapeType _shape;
 };
 
-class AutomationLine : public PBD::StatefulDestructible
+class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway
 {
   public:
         AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&);
@@ -117,7 +116,7 @@ class AutomationLine : public PBD::StatefulDestructible
        
        /* 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);
@@ -146,8 +145,6 @@ class AutomationLine : public PBD::StatefulDestructible
        void show_selection();
        void hide_selection ();
 
-       void set_point_size (double size);
-
        virtual string  get_verbose_cursor_string (float);
        virtual void view_to_model_y (double&) = 0;
        virtual void model_to_view_y (double&) = 0;
@@ -162,6 +159,7 @@ class AutomationLine : public PBD::StatefulDestructible
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&);
+       void set_colors();
 
   protected:
 
@@ -176,7 +174,8 @@ class AutomationLine : public PBD::StatefulDestructible
        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 */
@@ -195,18 +194,14 @@ class AutomationLine : public PBD::StatefulDestructible
        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);
 
        void reset_callback (const ARDOUR::AutomationList&);
-       void list_changed (ARDOUR::Change);
-
-       UndoAction get_memento();
+       void list_changed ();
 
        virtual bool event_handler (GdkEvent*);
        
@@ -216,10 +211,13 @@ class AutomationLine : public PBD::StatefulDestructible
        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 ();
 
        struct ModelRepresentation {
            ARDOUR::AutomationList::iterator start;