X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=3e0f0f4bb3c364b0a163f6d7b9f6a2180b943ed1;hb=0c04eb8d83e53cf34716486ef85bd868c57f4cc1;hp=c16bf60008b5939823cc189ca370ce83f8d86d0e;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index c16bf60008..3e0f0f4bb3 100644
--- a/gtk2_ardour/automation_line.h
+++ b/gtk2_ardour/automation_line.h
@@ -64,6 +64,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	void reset ();
 	void clear();
 
+	std::list<ControlPoint*> 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,
@@ -74,10 +75,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 (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);
+	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<ControlPoint*>, float, XMLNode *);
+	virtual std::pair<double, float> drag_motion (double, float, bool, bool);
+	virtual void end_drag ();
 
 	ControlPoint* nth (uint32_t);
 	uint32_t npoints() const { return control_points.size(); }
@@ -103,9 +105,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	ArdourCanvas::Item&  parent_group() const { return _parent_group; }
 	ArdourCanvas::Item&  grab_item() const { return *line; }
 
-	void show_selection();
-	void hide_selection ();
-
 	std::string get_verbose_cursor_string (double) const;
 	std::string fraction_to_string (double) const;
 	double string_to_fraction (std::string const &) const;
@@ -130,6 +129,9 @@ 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 ();
+
   protected:
 
 	std::string    _name;
@@ -164,31 +166,33 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	static bool invalid_point (ALPoints&, uint32_t index);
 
 	void determine_visible_control_points (ALPoints&);
-	void sync_model_with_view_point (ControlPoint&, bool did_push, int64_t distance);
-	void sync_model_with_view_line (uint32_t, uint32_t);
+	void sync_model_with_view_point (ControlPoint&, bool, int64_t);
+	void sync_model_with_view_points (std::list<ControlPoint*>, bool, int64_t);
+	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 ();
+	PBD::ScopedConnection _state_connection;
 
 	virtual bool event_handler (GdkEvent*);
 	virtual void add_model_point (ALPoints& tmp_points, double frame, double yfract);
 
   private:
-	uint32_t drags;
-	double   first_drag_fraction;
-	double   last_drag_fraction;
-	uint32_t line_drag_cp1;
-	uint32_t line_drag_cp2;
-	int64_t  drag_x;
-	int64_t  drag_distance;
+	std::list<ControlPoint*> _drag_points; ///< points we are dragging
+	std::list<ControlPoint*> _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 _last_drag_fraction; ///< last y position of the drag, as a fraction
+	std::list<double> _always_in_view;
 
 	const Evoral::TimeConverter<double, ARDOUR::sframes_t>& _time_converter;
 	ARDOUR::AutomationList::InterpolationStyle              _interpolation;
 
-	void modify_view_point (ControlPoint&, double, double, bool with_push);
 	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 ();