32/64bit compat

[ardour.git] / gtk2_ardour / automation_line.h

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 67e8fbc52ba46e418df180946de1bad6240dc44b..8554d487ee877208c3369420db297112cc667fd3 100644 (file)
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -34,10 +34,11 @@
 #include "pbd/memento_command.h"
 
 #include "ardour/automation_list.h"
+#include "ardour/parameter_descriptor.h"
 #include "ardour/types.h"
 
 #include "canvas/types.h"
-#include "canvas/group.h"
+#include "canvas/container.h"
 #include "canvas/poly_line.h"
 
 class AutomationLine;
@@ -60,9 +61,13 @@ public:
                SelectedControlPoints = 0x4
        };
        
-       AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&,
-                       boost::shared_ptr<ARDOUR::AutomationList>,
+       AutomationLine (const std::string&                                 name,
+                       TimeAxisView&                                      tv,
+                       ArdourCanvas::Item&                                parent,
+                       boost::shared_ptr<ARDOUR::AutomationList>          al,
+                       const ARDOUR::ParameterDescriptor&                 desc,
                        Evoral::TimeConverter<double, ARDOUR::framepos_t>* converter = 0);
+
        virtual ~AutomationLine ();
 
        void queue_reset ();
@@ -105,7 +110,7 @@ public:
 
        TimeAxisView& trackview;
 
-       ArdourCanvas::Group& canvas_group() const { return *group; }
+       ArdourCanvas::Container& canvas_group() const { return *group; }
        ArdourCanvas::Item&  parent_group() const { return _parent_group; }
        ArdourCanvas::Item&  grab_item() const { return *line; }
 
@@ -117,6 +122,7 @@ public:
        void   view_to_model_coord (double& x, double& y) const;
        void   view_to_model_coord_y (double &) const;
        void   model_to_view_coord (double& x, double& y) const;
+       void   model_to_view_coord_y (double &) const;
 
        void set_list(boost::shared_ptr<ARDOUR::AutomationList> list);
        boost::shared_ptr<ARDOUR::AutomationList> the_list() const { return alist; }
@@ -173,8 +179,8 @@ protected:
        /** true if we did a push at any point during the current drag */
        bool    did_push;
 
-       ArdourCanvas::Group&        _parent_group;
-       ArdourCanvas::Group*        group;
+       ArdourCanvas::Item&        _parent_group;
+       ArdourCanvas::Container*       group;
        ArdourCanvas::PolyLine*     line; /* line */
        ArdourCanvas::Points        line_points; /* coordinates for canvas line */
        std::vector<ControlPoint*>  control_points; /* visible control points */
@@ -200,8 +206,6 @@ private:
        void sync_model_with_view_points (std::list<ControlPoint*>);
        void start_drag_common (double, float);
 
-       virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
-
        void reset_callback (const Evoral::ControlList&);
        void list_changed ();
 
@@ -219,6 +223,7 @@ private:
         */
        ARDOUR::framecnt_t _offset;
 
+       bool is_stepped() const;
        void update_visibility ();
        void reset_line_coords (ControlPoint&);
        void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);
@@ -231,6 +236,8 @@ private:
        /** maximum time that a point on this line can be at, relative to the position of its region or start of its track */
        ARDOUR::framecnt_t _maximum_time;
 
+       const ARDOUR::ParameterDescriptor _desc;
+
        friend class AudioRegionGainLine;
 };