X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=bc9c75e8f78c40fb24735ce948c2cebf56fb23b4;hb=d8ade6d30595a3a8be343b392e47d422940eac27;hp=ec86b7455fd2cfddf4c6d3de4cd6997698abbe64;hpb=58631285534b35a325165427490a6ab9419f4c5d;p=ardour.git diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index ec86b7455f..bc9c75e8f7 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -15,7 +15,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #ifndef __ardour_automation_line_h__ @@ -30,9 +29,11 @@ #include #include "canvas.h" #include "simplerect.h" + #include +#include -#include +#include using std::vector; @@ -52,52 +53,10 @@ namespace Gnome { } } -class ControlPoint +class AutomationLine : public sigc::trackable, public PBD::StatefulThingWithGoingAway { public: - ControlPoint (AutomationLine& al); - ControlPoint (const ControlPoint&, bool dummy_arg_to_force_special_copy_constructor); - virtual ~ControlPoint (); - - enum ShapeType { - Full, - Start, - End - }; - - void move_to (double x, double y, ShapeType); - void reset (double x, double y, ARDOUR::AutomationList::iterator, uint32_t, ShapeType); - double get_x() const { return _x; } - double get_y() const { return _y; } - - void hide (); - void show (); - void show_color (bool entered, bool hide_too); - - void set_size (double); - void set_visible (bool); - - ArdourCanvas::SimpleRect* item; - AutomationLine& line; - uint32_t view_index; - ARDOUR::AutomationList::iterator model; - bool can_slide; - bool selected; - - protected: - virtual bool event_handler (GdkEvent*); - - private: - double _x; - double _y; - double _size; - ShapeType _shape; -}; - -class AutomationLine : public sigc::trackable, public Stateful -{ - public: - AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, ARDOUR::AutomationList&); + AutomationLine (const string & name, TimeAxisView&, ArdourCanvas::Group&, boost::shared_ptr); virtual ~AutomationLine (); void queue_reset (); @@ -105,7 +64,7 @@ class AutomationLine : public sigc::trackable, public Stateful void clear(); void set_selected_points (PointSelection&); - void get_selectables (jack_nframes_t& start, jack_nframes_t& end, + void get_selectables (nframes_t& start, nframes_t& end, double botfrac, double topfrac, list& results); void get_inverted_selectables (Selection&, list& results); @@ -115,8 +74,8 @@ class AutomationLine : public sigc::trackable, public Stateful /* dragging API */ - virtual void start_drag (ControlPoint*, float fraction); - virtual void point_drag(ControlPoint&, jack_nframes_t x, float, bool with_push); + virtual void start_drag (ControlPoint*, nframes_t x, float fraction); + virtual void point_drag(ControlPoint&, nframes_t x, float, bool with_push); virtual void end_drag (ControlPoint*); virtual void line_drag(uint32_t i1, uint32_t i2, float, bool with_push); @@ -126,13 +85,16 @@ class AutomationLine : public sigc::trackable, public Stateful string name() const { return _name; } bool visible() const { return _visible; } guint32 height() const { return _height; } + guint32 y_position() const { return _y_position; } - void set_line_color (uint32_t); + void set_line_color (uint32_t); uint32_t get_line_color() const { return _line_color; } + void set_interpolation(ARDOUR::AutomationList::InterpolationStyle style); + void show (); void hide (); - void set_height (guint32); + void set_y_position_and_height (double, double); void set_verbose_cursor_uses_gain_mapping (bool yn); TimeAxisView& trackview; @@ -144,30 +106,32 @@ class AutomationLine : public sigc::trackable, public Stateful void show_selection(); void hide_selection (); - void set_point_size (double size); - - virtual string get_verbose_cursor_string (float); - virtual void view_to_model_y (double&) = 0; - virtual void model_to_view_y (double&) = 0; + virtual string get_verbose_cursor_string (double); + virtual void view_to_model_y (double&); + virtual void model_to_view_y (double&); - ARDOUR::AutomationList& the_list() const { return alist; } + 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(); + bool is_last_point (ControlPoint &); bool is_first_point (ControlPoint &); XMLNode& get_state (void); int set_state (const XMLNode&); + void set_colors(); - PBD::ID id() { return _id; } protected: - PBD::ID _id; + string _name; + guint32 _y_position; guint32 _height; uint32_t _line_color; - ARDOUR::AutomationList& alist; + boost::shared_ptr alist; bool _visible : 1; bool _vc_uses_gain_mapping : 1; @@ -175,7 +139,8 @@ class AutomationLine : public sigc::trackable, public Stateful bool update_pending : 1; bool no_draw : 1; bool points_visible : 1; - + bool did_push; + ArdourCanvas::Group& _parent_group; ArdourCanvas::Group* group; ArdourCanvas::Line* line; /* line */ @@ -194,18 +159,14 @@ class AutomationLine : public sigc::trackable, public Stateful static bool invalid_point (ALPoints&, uint32_t index); void determine_visible_control_points (ALPoints&); - void sync_model_from (ControlPoint&); - void sync_model_with_view_point (ControlPoint&); + void sync_model_with_view_point (ControlPoint&, bool did_push, int64_t distance); void sync_model_with_view_line (uint32_t, uint32_t); - void modify_view (ControlPoint&, double, double, bool with_push); virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y); virtual void change_model_range (ARDOUR::AutomationList::iterator,ARDOUR::AutomationList::iterator, double delta, float ydelta); - void reset_callback (const ARDOUR::AutomationList&); - void list_changed (ARDOUR::Change); - - UndoAction get_memento(); + void reset_callback (const Evoral::ControlList&); + void list_changed (); virtual bool event_handler (GdkEvent*); @@ -215,21 +176,26 @@ class AutomationLine : public sigc::trackable, public Stateful double last_drag_fraction; uint32_t line_drag_cp1; uint32_t line_drag_cp2; + int64_t drag_x; + int64_t drag_distance; + + ARDOUR::AutomationList::InterpolationStyle _interpolation; void modify_view_point(ControlPoint&, double, double, bool with_push); void reset_line_coords (ControlPoint&); - void update_line (); + + double control_point_box_size (); struct ModelRepresentation { ARDOUR::AutomationList::iterator start; ARDOUR::AutomationList::iterator end; - jack_nframes_t xpos; + nframes_t xpos; double ypos; - jack_nframes_t xmin; + nframes_t xmin; double ymin; - jack_nframes_t xmax; + nframes_t xmax; double ymax; - jack_nframes_t xval; + nframes_t xval; double yval; };