X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=57d90a1edc33149266a1f7ffa8f7126005ab9785;hb=HEAD;hp=054e84e7892d162653dc0df6d33ecf6326e0513b;hpb=a643c9fdc08f98c7750a2474004a75e143077be9;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 054e84e789..57d90a1edc 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -25,10 +25,7 @@ #include #include -#include #include -#include "canvas.h" -#include "simplerect.h" #include "evoral/TimeConverter.hpp" @@ -37,8 +34,13 @@ #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/container.h" +#include "canvas/poly_line.h" + class AutomationLine; class ControlPoint; class PointSelection; @@ -46,12 +48,8 @@ class TimeAxisView; class AutomationTimeAxisView; class Selectable; class Selection; +class PublicEditor; -namespace Gnome { - namespace Canvas { - class SimpleRect; - } -} /** A GUI representation of an ARDOUR::AutomationList */ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible @@ -62,18 +60,23 @@ public: 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& tv, + ArdourCanvas::Item& parent, + boost::shared_ptr al, + const ARDOUR::ParameterDescriptor& desc, + Evoral::TimeConverter* converter = 0); + virtual ~AutomationLine (); void queue_reset (); void reset (); void clear (); + void set_fill (bool f) { _fill = f; } // owner needs to call set_height void set_selected_points (PointSelection const &); - void get_selectables (ARDOUR::framepos_t, ARDOUR::framepos_t, double, double, std::list&); + void get_selectables (ARDOUR::samplepos_t, ARDOUR::samplepos_t, double, double, std::list&); void get_inverted_selectables (Selection&, std::list& results); virtual void remove_point (ControlPoint&); @@ -83,7 +86,7 @@ public: 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 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); @@ -103,23 +106,27 @@ public: void hide (); void set_height (guint32); - void set_uses_gain_mapping (bool yn); - bool get_uses_gain_mapping () const { return _uses_gain_mapping; } + + bool get_uses_gain_mapping () const; 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; } 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 delta_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 model_to_view_coord_y (double &) const; + + double compute_delta (double from, double to) const; + void apply_delta (double& val, double delta) const; void set_list(boost::shared_ptr list); boost::shared_ptr the_list() const { return alist; } @@ -138,36 +145,36 @@ public: virtual MementoCommandBinder* memento_command_binder (); - const Evoral::TimeConverter& time_converter () const { + const Evoral::TimeConverter& time_converter () const { return *_time_converter; } - std::pair get_point_x_range () const; + std::pair get_point_x_range () const; - void set_maximum_time (ARDOUR::framecnt_t); - ARDOUR::framecnt_t maximum_time () const { + void set_maximum_time (ARDOUR::samplecnt_t); + ARDOUR::samplecnt_t maximum_time () const { return _maximum_time; } - void set_offset (ARDOUR::framecnt_t); - void set_width (ARDOUR::framecnt_t); + void set_offset (ARDOUR::samplecnt_t); + ARDOUR::samplecnt_t offset () { return _offset; } + void set_width (ARDOUR::samplecnt_t); - framepos_t session_position (ARDOUR::AutomationList::const_iterator) const; + samplepos_t session_position (ARDOUR::AutomationList::const_iterator) const; protected: std::string _name; - guint32 _height; - uint32_t _line_color; + guint32 _height; + uint32_t _line_color; boost::shared_ptr alist; - Evoral::TimeConverter* _time_converter; + Evoral::TimeConverter* _time_converter; /** true if _time_converter belongs to us (ie we should delete it on destruction) */ bool _our_time_converter; VisibleAspects _visible; - - bool _uses_gain_mapping; + bool terminal_points_can_slide; bool update_pending; bool have_timeout; @@ -176,9 +183,9 @@ 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::Line* 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 */ @@ -186,8 +193,8 @@ protected: public: ContiguousControlPoints (AutomationLine& al); double clamp_dx (double dx); - void move (double dx, double dy); - void compute_x_bounds (); + void move (double dx, double dvalue); + void compute_x_bounds (PublicEditor& e); private: AutomationLine& line; double before_x; @@ -199,12 +206,10 @@ private: typedef boost::shared_ptr CCP; std::vector contiguous_points; - void sync_model_with_view_point (ControlPoint&); - void sync_model_with_view_points (std::list); + bool sync_model_with_view_point (ControlPoint&); + bool sync_model_with_view_points (std::list); 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 (); @@ -220,9 +225,10 @@ private: /** 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; + ARDOUR::samplecnt_t _offset; - void show (); + 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); double control_point_box_size (); @@ -232,7 +238,11 @@ private: 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; + ARDOUR::samplecnt_t _maximum_time; + + bool _fill; + + const ARDOUR::ParameterDescriptor _desc; friend class AudioRegionGainLine; };