make that status-bar error change actually compile

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 0567ffaa56a0a0f88a71763e418d28f5bb02b70b..dcbbac76046ba3564c05bcd4cfae318af9fa494d 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&, 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);
@@ -129,7 +128,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        bool    visible() const { return _visible; }
        guint32 height() const { return _height; }
 
-       void         set_line_color (uint32_t);
+       void     set_line_color (uint32_t);
        uint32_t get_line_color() const { return _line_color; }
 
        void    show ();
@@ -146,9 +145,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        void show_selection();
        void hide_selection ();
 
-       void set_point_size (double size);
-
-       virtual string  get_verbose_cursor_string (float);
+       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 sigc::trackable, public PBD::StatefulThingWithGoin
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&);
+       void set_colors();
 
   protected:
 
@@ -174,13 +172,14 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        bool    _vc_uses_gain_mapping : 1;
        bool    terminal_points_can_slide : 1;
        bool    update_pending : 1;
-       bool    no_draw : 1;
+       bool    auto_is_boolean : 1;
        bool    points_visible : 1;
-       
+       bool    did_push;
+
        ArdourCanvas::Group&  _parent_group;
        ArdourCanvas::Group*   group;
-       ArdourCanvas::Line*   line; /* line */
-       ArdourCanvas::Points  line_points; /* coordinates for canvas line */
+       ArdourCanvas::Line*    line; /* line */
+       ArdourCanvas::Points   line_points; /* coordinates for canvas line */
        vector<ControlPoint*>  control_points; /* visible control points */
 
        struct ALPoint {
@@ -195,18 +194,17 @@ 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);
 
        void reset_callback (const ARDOUR::AutomationList&);
-       void list_changed (ARDOUR::Change);
+       void list_changed ();
 
        virtual bool event_handler (GdkEvent*);
+       virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract);
        
   private:
        uint32_t drags;
@@ -214,10 +212,13 @@ 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 ();
 
        struct ModelRepresentation {
            ARDOUR::AutomationList::iterator start;
@@ -237,5 +238,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoin
        friend class AudioRegionGainLine;
 };
 
+
 #endif /* __ardour_automation_line_h__ */