X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=663310dc46c9d339e6433c219606c2e05c13847f;hb=23e7cf10191270d70357ccf0ed9294f020c7b7ab;hp=816105b1e56b70c8333c5c6b2c0a775043200db4;hpb=e5888d398350b26ba2cdc634cc9791e90b4fc6b6;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 816105b1e5..663310dc46 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -37,8 +37,8 @@ #include "ardour/types.h" #include "canvas/types.h" -#include "canvas/group.h" -#include "canvas/curve.h" +#include "canvas/container.h" +#include "canvas/poly_line.h" class AutomationLine; class ControlPoint; @@ -47,21 +47,22 @@ class TimeAxisView; class AutomationTimeAxisView; class Selectable; class Selection; +class PublicEditor; /** A GUI representation of an ARDOUR::AutomationList */ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible { - public: +public: enum VisibleAspects { Line = 0x1, ControlPoints = 0x2, SelectedControlPoints = 0x4 }; - AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, - boost::shared_ptr, - Evoral::TimeConverter* converter = 0); + AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Item&, + boost::shared_ptr, + Evoral::TimeConverter* converter = 0); virtual ~AutomationLine (); void queue_reset (); @@ -76,11 +77,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible bool control_points_adjacent (double xval, uint32_t& before, uint32_t& after); /* dragging API */ - virtual void start_drag_single (ControlPoint*, double, float); - virtual void start_drag_line (uint32_t, uint32_t, float); - virtual void start_drag_multiple (std::list, float, XMLNode *); - virtual std::pair drag_motion (double, float, bool, bool with_push, uint32_t& final_index); - virtual void end_drag (bool with_push, uint32_t final_index); + virtual void start_drag_single (ControlPoint*, double, float); + virtual void start_drag_line (uint32_t, uint32_t, float); + virtual void start_drag_multiple (std::list, float, XMLNode *); + virtual std::pair drag_motion (double, float, bool, bool with_push, uint32_t& final_index); + virtual void end_drag (bool with_push, uint32_t final_index); ControlPoint* nth (uint32_t); ControlPoint const * nth (uint32_t) const; @@ -104,14 +105,14 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible 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; } - std::string get_verbose_cursor_string (double) const; - std::string get_verbose_cursor_relative_string (double, double) const; + virtual std::string get_verbose_cursor_string (double) const; + std::string get_verbose_cursor_relative_string (double, double) const; std::string fraction_to_string (double) const; - std::string fraction_to_relative_string (double, double) const; + std::string fraction_to_relative_string (double, double) const; double string_to_fraction (std::string const &) const; void view_to_model_coord (double& x, double& y) const; void view_to_model_coord_y (double &) const; @@ -141,7 +142,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::pair get_point_x_range () const; void set_maximum_time (ARDOUR::framecnt_t); - ARDOUR::framecnt_t maximum_time () const { + ARDOUR::framecnt_t maximum_time () const { return _maximum_time; } @@ -150,7 +151,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible framepos_t session_position (ARDOUR::AutomationList::const_iterator) const; - protected: +protected: std::string _name; guint32 _height; @@ -163,41 +164,41 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible VisibleAspects _visible; - bool _uses_gain_mapping; - bool terminal_points_can_slide; - bool update_pending; - bool have_timeout; - bool no_draw; - bool _is_boolean; + bool _uses_gain_mapping; + bool terminal_points_can_slide; + bool update_pending; + bool have_timeout; + bool no_draw; + bool _is_boolean; /** true if we did a push at any point during the current drag */ bool did_push; - ArdourCanvas::Group& _parent_group; - ArdourCanvas::Group* group; - ArdourCanvas::Curve* line; /* line */ + ArdourCanvas::Item& _parent_group; + ArdourCanvas::Container* group; + ArdourCanvas::PolyLine* line; /* line */ ArdourCanvas::Points line_points; /* coordinates for canvas line */ std::vector control_points; /* visible control points */ - class ContiguousControlPoints : public std::list { - public: - ContiguousControlPoints (AutomationLine& al); - double clamp_dx (double dx); - void move (double dx, double dy); - void compute_x_bounds (); - private: - AutomationLine& line; - double before_x; - double after_x; + class ContiguousControlPoints : public std::list { +public: + ContiguousControlPoints (AutomationLine& al); + double clamp_dx (double dx); + void move (double dx, double dy); + void compute_x_bounds (PublicEditor& e); +private: + AutomationLine& line; + double before_x; + double after_x; }; - friend class ContiguousControlPoints; + friend class ContiguousControlPoints; typedef boost::shared_ptr CCP; - std::vector contiguous_points; + std::vector contiguous_points; void sync_model_with_view_point (ControlPoint&); void sync_model_with_view_points (std::list); - void start_drag_common (double, float); + void start_drag_common (double, float); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); @@ -206,7 +207,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible virtual bool event_handler (GdkEvent*); - private: +private: std::list _drag_points; ///< points we are dragging std::list _push_points; ///< additional points we are dragging if "push" is enabled bool _drag_had_movement; ///< true if the drag has seen movement, otherwise false @@ -218,7 +219,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible */ ARDOUR::framecnt_t _offset; - void show (); + void update_visibility (); void reset_line_coords (ControlPoint&); void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t); double control_point_box_size ();