X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.h;h=3e0f0f4bb3c364b0a163f6d7b9f6a2180b943ed1;hb=c2c224727eee4c16bd64ca4a5b5bb2d276f5afe3;hp=436e5cbb205ac05ff3f7043947364e1b2421b6cf;hpb=f5acf936728c721bc556b7b3dfe69ebf0c3d63ed;p=ardour.git

diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h
index 436e5cbb20..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,10 @@ 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*, nframes_t x, float);
+	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 void drag_motion (nframes_t, float, bool);
+	virtual std::pair<double, float> drag_motion (double, float, bool, bool);
 	virtual void end_drag ();
 
 	ControlPoint* nth (uint32_t);
@@ -104,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;
@@ -170,7 +168,7 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 	void determine_visible_control_points (ALPoints&);
 	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 (nframes_t, float);
+	void start_drag_common (double, float);
 
 	virtual void change_model (ARDOUR::AutomationList::iterator, double x, double y);
 
@@ -183,16 +181,16 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible
 
   private:
 	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
-	nframes64_t drag_x; ///< last x position of the drag, in frames
-	nframes64_t drag_distance; ///< total x movement of the drag, in frames
+	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, bool with_push);
 	void reset_line_coords (ControlPoint&);
 	void add_visible_control_point (uint32_t, uint32_t, double, double, ARDOUR::AutomationList::iterator, uint32_t);