X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=bee78c4ef51524061c7facf4e415784aefcea1b7;hb=6ee23029a338951705c589be6c61ab52099758b6;hp=efc25eb84b5d247bffdd3372efd62d47fe87483a;hpb=66062a85b6388b28ed04f90bab3d302eec0f2a77;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index efc25eb84b..bee78c4ef5 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -59,18 +59,15 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible public: AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr, - const Evoral::TimeConverter* converter = 0); + Evoral::TimeConverter* converter = 0); virtual ~AutomationLine (); void queue_reset (); void reset (); - void clear(); + void clear (); - std::list point_selection_to_control_points (PointSelection const &); - void set_selected_points (PointSelection&); - void get_selectables (nframes_t& start, nframes_t& end, - double botfrac, double topfrac, - std::list& results); + void set_selected_points (PointSelection const &); + void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list&); void get_inverted_selectables (Selection&, std::list& results); virtual void remove_point (ControlPoint&); @@ -84,6 +81,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible virtual void end_drag (); ControlPoint* nth (uint32_t); + ControlPoint const * nth (uint32_t) const; uint32_t npoints() const { return control_points.size(); } std::string name() const { return _name; } @@ -109,6 +107,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::string fraction_to_string (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; void model_to_view_coord (double& x, double& y) const; void set_list(boost::shared_ptr list); @@ -129,11 +128,24 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void modify_point_y (ControlPoint&, double); - void add_always_in_view (double); - void clear_always_in_view (); - virtual MementoCommandBinder* memento_command_binder (); + const Evoral::TimeConverter& time_converter () const { + return *_time_converter; + } + + std::pair get_point_x_range () const; + + void set_maximum_time (ARDOUR::framecnt_t); + ARDOUR::framecnt_t maximum_time () const { + return _maximum_time; + } + + void set_offset (ARDOUR::framecnt_t); + void set_width (ARDOUR::framecnt_t); + + framepos_t session_position (ARDOUR::AutomationList::const_iterator) const; + protected: std::string _name; @@ -141,12 +153,16 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible uint32_t _line_color; boost::shared_ptr alist; + Evoral::TimeConverter* _time_converter; + /** true if _time_converter belongs to us (ie we should delete it on destruction) */ + bool _our_time_converter; bool _visible : 1; bool _uses_gain_mapping : 1; bool terminal_points_can_slide : 1; bool update_pending : 1; bool no_draw : 1; + bool _is_boolean : 1; bool points_visible : 1; bool did_push; @@ -156,20 +172,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible ArdourCanvas::Points line_points; /* coordinates for canvas line */ std::vector control_points; /* visible control points */ - struct ALPoint { - double x; - double y; - ALPoint (double xx, double yy) : x(xx), y(yy) {} - }; - - typedef std::vector ALPoints; - - static void invalidate_point (ALPoints&, uint32_t index); - static bool invalid_point (ALPoints&, uint32_t index); - - void determine_visible_control_points (ALPoints&); - void sync_model_with_view_point (ControlPoint&, bool, int64_t); - void sync_model_with_view_points (std::list, bool, int64_t); + void sync_model_with_view_point (ControlPoint&, ARDOUR::framecnt_t); + void sync_model_with_view_points (std::list, ARDOUR::framecnt_t); void start_drag_common (double, float); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); @@ -178,18 +182,18 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void list_changed (); virtual bool event_handler (GdkEvent*); - virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract); 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 double _drag_x; ///< last x position of the drag, in units - double _drag_distance; ///< total x movement of the drag, in units + double _drag_distance; ///< total x movement of the drag, in canvas units double _last_drag_fraction; ///< last y position of the drag, as a fraction - std::list _always_in_view; - - const Evoral::TimeConverter& _time_converter; + /** offset from the start of the automation list to the start of the line, so that + * a +ve offset means that the 0 on the line is at _offset in the list + */ + ARDOUR::framecnt_t _offset; void reset_line_coords (ControlPoint&); void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t); @@ -197,23 +201,11 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void connect_to_list (); void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle); - struct ModelRepresentation { - ARDOUR::AutomationList::iterator start; - ARDOUR::AutomationList::iterator end; - double xpos; - double ypos; - double xmin; - double ymin; - double xmax; - double ymax; - double xval; - double yval; - }; - - void model_representation (ControlPoint&, ModelRepresentation&); - PBD::ScopedConnectionList _list_connections; - + + /** 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; + friend class AudioRegionGainLine; };