X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_line.cc;h=7206f2dfdcd4aae7b02be40246bf9d45066ca14e;hb=5cb4efea80588c6e3be3b58f573d9a5d6f6a7e1b;hp=9a5a9098c71a382f35582ca196d0897017e441fd;hpb=ed626628b54e67dd9621c08d82a42afaed00c7ac;p=ardour.git

diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc
index 9a5a9098c7..7206f2dfdc 100644
--- a/gtk2_ardour/automation_line.cc
+++ b/gtk2_ardour/automation_line.cc
@@ -340,11 +340,19 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr)
 	}
 }
 
+/** @param points AutomationLine points to consider.  These will correspond 1-to-1 to
+ *  points in the AutomationList, but will have been transformed so that they are in pixels;
+ *  the x coordinate being the pixel distance from the start of the line (0, or the start
+ *  of the AutomationRegionView if we are in one).
+ *
+ *  @param skipped Number of points in the AutomationList that were skipped before
+ *  `points' starts.
+ */
+
 void
-AutomationLine::determine_visible_control_points (ALPoints& points)
+AutomationLine::determine_visible_control_points (ALPoints& points, int skipped)
 {
 	uint32_t view_index, pi, n;
-	AutomationList::iterator model;
 	uint32_t npoints;
 	uint32_t this_rx = 0;
 	uint32_t prev_rx = 0;
@@ -383,8 +391,16 @@ AutomationLine::determine_visible_control_points (ALPoints& points)
 
 	view_index = 0;
 
-	for (model = alist->begin(), pi = 0; pi < npoints; ++model, ++pi) {
+	/* skip over unused AutomationList points before we start */
+
+	AutomationList::iterator model = alist->begin ();
+	for (int i = 0; i < skipped; ++i) {
+		++model;
+	}
+
+	for (pi = 0; pi < npoints; ++model, ++pi) {
 
+		/* If this line is in an AutomationRegionView, this is an offset from the region position, in pixels */
 		double tx = points[pi].x;
 		double ty = points[pi].y;
 
@@ -521,7 +537,7 @@ AutomationLine::fraction_to_string (double fraction) const
 		if (fraction == 0.0) {
 			snprintf (buf, sizeof (buf), "-inf");
 		} else {
-			snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain (fraction)));
+			snprintf (buf, sizeof (buf), "%.1f", accurate_coefficient_to_dB (slider_position_to_gain_with_max (fraction, Config->get_max_gain())));
 		}
 	} else {
 		view_to_model_coord_y (fraction);
@@ -551,7 +567,7 @@ AutomationLine::string_to_fraction (string const & s) const
 	sscanf (s.c_str(), "%lf", &v);
 
 	if (_uses_gain_mapping) {
-		v = gain_to_slider_position (dB_to_coefficient (v));
+		v = gain_to_slider_position_with_max (dB_to_coefficient (v), Config->get_max_gain());
 	} else {
 		double dummy = 0.0;
 		model_to_view_coord (dummy, v);
@@ -973,7 +989,12 @@ AutomationLine::get_selectables (
 
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		double const model_when = (*(*i)->model())->when;
-		framepos_t const session_frames_when = _time_converter.to (model_when - _offset) + _time_converter.origin_b ();
+
+		/* model_when is relative to the start of the source, so we just need to add on the origin_b here
+		   (as it is the session frame position of the start of the source)
+		*/
+		
+		framepos_t const session_frames_when = _time_converter.to (model_when) + _time_converter.origin_b ();
 
 		if (session_frames_when >= start && session_frames_when <= end && (*i)->get_y() >= bot_track && (*i)->get_y() <= top_track) {
 			results.push_back (*i);
@@ -1004,8 +1025,8 @@ AutomationLine::point_selection_to_control_points (PointSelection const & s)
 
 		for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
 
-			double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start));
-			double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end));
+			double const rstart = trackview.editor().frame_to_unit (_time_converter.to (i->start) - _offset);
+			double const rend = trackview.editor().frame_to_unit (_time_converter.to (i->end) - _offset);
 
 			if ((*j)->get_x() >= rstart && (*j)->get_x() <= rend) {
 				if ((*j)->get_y() >= bot && (*j)->get_y() <= top) {
@@ -1020,7 +1041,7 @@ AutomationLine::point_selection_to_control_points (PointSelection const & s)
 }
 
 void
-AutomationLine::set_selected_points (PointSelection& points)
+AutomationLine::set_selected_points (PointSelection const & points)
 {
 	for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
 		(*i)->set_selected (false);
@@ -1066,6 +1087,7 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 	}
 
 	AutomationList::const_iterator ai;
+	int skipped = 0;
 
 	for (ai = events.begin(); ai != events.end(); ++ai) {
 
@@ -1078,10 +1100,12 @@ AutomationLine::reset_callback (const Evoral::ControlList& events)
 						      trackview.editor().frame_to_unit (translated_x),
 						      _height - (translated_y * _height))
 				);
+		} else if (translated_x < 0) {
+			++skipped;
 		}
 	}
 
-	determine_visible_control_points (tmp_points);
+	determine_visible_control_points (tmp_points, skipped);
 }
 
 void
@@ -1198,7 +1222,7 @@ AutomationLine::view_to_model_coord_y (double& y) const
 	/* TODO: This should be more generic ... */
 	if (alist->parameter().type() == GainAutomation ||
 	    alist->parameter().type() == EnvelopeAutomation) {
-		y = slider_position_to_gain (y);
+		y = slider_position_to_gain_with_max (y, Config->get_max_gain());
 		y = max (0.0, y);
 		y = min (2.0, y);
 	} else if (alist->parameter().type() == PanAzimuthAutomation ||
@@ -1218,7 +1242,7 @@ AutomationLine::model_to_view_coord (double& x, double& y) const
 	/* TODO: This should be more generic ... */
 	if (alist->parameter().type() == GainAutomation ||
 	    alist->parameter().type() == EnvelopeAutomation) {
-		y = gain_to_slider_position (y);
+		y = gain_to_slider_position_with_max (y, Config->get_max_gain());
 	} else if (alist->parameter().type() == PanAzimuthAutomation ||
                    alist->parameter().type() == PanElevationAutomation ||
                    alist->parameter().type() == PanWidthAutomation) {