X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=816105b1e56b70c8333c5c6b2c0a775043200db4;hb=6a4cddbc4c645fd0d49d60b854b1773b32026770;hp=3ca2ec171bac64531f4a0284e39ae93441cc0e2e;hpb=49240fe7c5fef9b7830bafd2430f9143105a6f69;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 3ca2ec171b..816105b1e5 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" @@ -39,6 +36,10 @@ #include "ardour/automation_list.h" #include "ardour/types.h" +#include "canvas/types.h" +#include "canvas/group.h" +#include "canvas/curve.h" + class AutomationLine; class ControlPoint; class PointSelection; @@ -47,16 +48,17 @@ class AutomationTimeAxisView; class Selectable; class Selection; -namespace Gnome { - namespace Canvas { - class SimpleRect; - } -} /** A GUI representation of an ARDOUR::AutomationList */ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible { public: + enum VisibleAspects { + Line = 0x1, + ControlPoints = 0x2, + SelectedControlPoints = 0x4 + }; + AutomationLine (const std::string& name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr, Evoral::TimeConverter* converter = 0); @@ -66,7 +68,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void reset (); void clear (); - std::list point_selection_to_control_points (PointSelection const &); 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); @@ -75,28 +76,31 @@ 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); - virtual void end_drag (); + 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; uint32_t npoints() const { return control_points.size(); } std::string name() const { return _name; } - bool visible() const { return _visible; } + bool visible() const { return _visible != VisibleAspects(0); } guint32 height() const { return _height; } void set_line_color (uint32_t); uint32_t get_line_color() const { return _line_color; } - void show (); - void hide (); - void set_height (guint32); - void set_uses_gain_mapping (bool yn); - bool get_uses_gain_mapping () const { return _uses_gain_mapping; } + void set_visibility (VisibleAspects); + void add_visibility (VisibleAspects); + void remove_visibility (VisibleAspects); + + void hide (); + void set_height (guint32); + void set_uses_gain_mapping (bool yn); + bool get_uses_gain_mapping () const { return _uses_gain_mapping; } TimeAxisView& trackview; @@ -105,7 +109,9 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible 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; std::string fraction_to_string (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; @@ -114,9 +120,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible void set_list(boost::shared_ptr list); boost::shared_ptr the_list() const { return alist; } - void show_all_control_points (); - void hide_all_but_selected_control_points (); - void track_entered(); void track_exited(); @@ -129,9 +132,6 @@ 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 { @@ -148,6 +148,8 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible 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; @@ -156,27 +158,46 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible boost::shared_ptr alist; Evoral::TimeConverter* _time_converter; - /** true if _time_converter belongs to us (ie we should delete it) */ + /** 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; + VisibleAspects _visible; + + 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::Line* line; /* line */ + ArdourCanvas::Curve* line; /* line */ ArdourCanvas::Points line_points; /* coordinates for canvas line */ std::vector control_points; /* visible control points */ - void sync_model_with_view_point (ControlPoint&, bool, int64_t); - void sync_model_with_view_points (std::list, bool, int64_t); - void start_drag_common (double, float); + 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; + }; + + friend class ContiguousControlPoints; + + typedef boost::shared_ptr CCP; + 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); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); @@ -190,14 +211,14 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible 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; /** 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 show (); 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 ();