From 279c9d8b4ccc70397ba709c7084133a83b5196fa Mon Sep 17 00:00:00 2001
From: Carl Hetherington <carl@carlh.net>
Date: Sun, 20 Feb 2011 17:57:45 +0000
Subject: [PATCH] Fix plugin parameter controllers again (#3767).

git-svn-id: svn://localhost/ardour2/branches/3.0@8912 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 libs/ardour/ardour/plugin_insert.h |  1 +
 libs/ardour/plugin_insert.cc       | 28 ++++++++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 45a0478584..a0e2e19a13 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -88,6 +88,7 @@ class PluginInsert : public Processor
 		double user_to_ui (double) const;
 		double ui_to_user (double) const;
 		double plugin_to_ui (double) const;
+		double plugin_to_user (double) const;
                 
 	private:
 		double user_to_plugin (double) const;
diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc
index 43df8cc29d..052b3a3e02 100644
--- a/libs/ardour/plugin_insert.cc
+++ b/libs/ardour/plugin_insert.cc
@@ -1091,12 +1091,18 @@ PluginInsert::PluginControl::ui_to_user (double val) const
 /** Convert plugin values to UI values.  See pbd/controllable.h */
 double
 PluginInsert::PluginControl::plugin_to_ui (double val) const
+{
+	return user_to_ui (plugin_to_user (val));
+}
+
+double
+PluginInsert::PluginControl::plugin_to_user (double val) const
 {
 	if (_sr_dependent) {
 		val = val * _session.frame_rate ();
 	}
 
-	return user_to_ui (val);
+	return val;
 }
 
 XMLNode&
@@ -1111,27 +1117,13 @@ PluginInsert::PluginControl::get_state ()
         return node;
 }
 
+/** @return `user' val */
 double
-PluginInsert::PluginControl::get_value (void) const
+PluginInsert::PluginControl::get_value () const
 {
 	/* FIXME: probably should be taking out some lock here.. */
 
-	double val = _plugin->get_parameter (_list->parameter());
-
-	return val;
-
-	/*if (_toggled) {
-
-		return val;
-
-	} else {
-
-		if (_logarithmic) {
-			val = log(val);
-		}
-
-		return ((val - lower) / range);
-	}*/
+	return plugin_to_user (_plugin->get_parameter (_list->parameter()));
 }
 
 boost::shared_ptr<Plugin>