From b99721ec3b59cf22a0bd1f6583401c6da7bb5d95 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 5 Aug 2010 13:37:04 +0000 Subject: [PATCH] Remove somewhat confusing view_to_model_coord_x method. git-svn-id: svn://localhost/ardour2/branches/3.0@7546 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/automation_line.cc | 10 ++-------- gtk2_ardour/automation_line.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 9ca1c59bb0..ead6a2b56d 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -280,7 +280,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) mr.xval = (*cp.model())->when; } else { mr.xval = trackview.editor().unit_to_frame (mr.xval); - view_to_model_coord_x (mr.xval); + mr.xval = _time_converter.from (mr.xval); } /* convert y to model units; the x was already done above @@ -1216,16 +1216,10 @@ AutomationLine::set_state (const XMLNode &node, int version) void AutomationLine::view_to_model_coord (double& x, double& y) const { - view_to_model_coord_x (x); + x = _time_converter.from (x); view_to_model_coord_y (y); } -void -AutomationLine::view_to_model_coord_x (double& x) const -{ - x = _time_converter.from(x); -} - void AutomationLine::view_to_model_coord_y (double& y) const { diff --git a/gtk2_ardour/automation_line.h b/gtk2_ardour/automation_line.h index 1464170c34..2704c13146 100644 --- a/gtk2_ardour/automation_line.h +++ b/gtk2_ardour/automation_line.h @@ -109,7 +109,6 @@ class AutomationLine : public sigc::trackable, public PBD::StatefulDestructible std::string fraction_to_string (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_x (double &) const; void view_to_model_coord_y (double &) const; void model_to_view_coord (double& x, double& y) const;