Reinstate user Controllable values, as they are needed

for gain (which I forgot about).


git-svn-id: svn://localhost/ardour2/branches/3.0@11293 d708f5d6-7413-0410-9779-e7cbd77b26cf

3 files changed, 13 insertions, 15 deletions

diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc
index 9a06b91da5..91009bf487 100644
--- a/gtk2_ardour/automation_controller.cc
+++ b/gtk2_ardour/automation_controller.cc
@@ -95,11 +95,11 @@ AutomationController::get_label (double& xpos)
 void
 AutomationController::display_effective_value()
 {
-	double const ui_value = _controllable->user_to_ui (_controllable->get_value());
+	double const interface_value = _controllable->internal_to_interface (_controllable->get_value());
 
-	if (_adjustment->get_value() != ui_value) {
+	if (_adjustment->get_value () != interface_value) {
 		_ignore_change = true;
-		_adjustment->set_value (ui_value);
+		_adjustment->set_value (interface_value);
 		_ignore_change = false;
 	}
 }
@@ -108,7 +108,7 @@ void
 AutomationController::value_adjusted ()
 {
 	if (!_ignore_change) {
-		_controllable->set_value (_controllable->ui_to_user (_adjustment->get_value()));
+		_controllable->set_value (_controllable->interface_to_internal (_adjustment->get_value()));
 	}
 }
 
diff --git a/gtk2_ardour/generic_pluginui.cc b/gtk2_ardour/generic_pluginui.cc
index 671cc988ac..08ad93285a 100644
--- a/gtk2_ardour/generic_pluginui.cc
+++ b/gtk2_ardour/generic_pluginui.cc
@@ -570,8 +570,8 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
 		Adjustment* adj = control_ui->controller->adjustment();
 		boost::shared_ptr<PluginInsert::PluginControl> pc = boost::dynamic_pointer_cast<PluginInsert::PluginControl> (control_ui->control);
 
-		adj->set_lower (pc->user_to_ui (desc.lower));
-		adj->set_upper (pc->user_to_ui (desc.upper));
+		adj->set_lower (pc->internal_to_interface (desc.lower));
+		adj->set_upper (pc->internal_to_interface (desc.upper));
 
 		adj->set_step_increment (desc.step);
 		adj->set_page_increment (desc.largestep);
@@ -594,7 +594,7 @@ GenericPluginUI::build_control_ui (guint32 port_index, boost::shared_ptr<Automat
 
 		}
 
-		adj->set_value (pc->user_to_ui (plugin->get_parameter (port_index)));
+		adj->set_value (pc->internal_to_interface (plugin->get_parameter (port_index)));
 
 		/* XXX memory leak: SliderController not destroyed by ControlUI
 		   destructor, and manage() reports object hierarchy
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index 70d35d053a..db5ee835c5 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -385,14 +385,14 @@ ProcessorEntry::Control::Control (Glib::RefPtr<Gdk::Pixbuf> s, boost::shared_ptr
 	_slider.show ();
 	box.pack_start (_slider);
 
-	double const lo = c->user_to_ui (c->lower ());
-	double const up = c->user_to_ui (c->upper ());
+	double const lo = c->internal_to_interface (c->lower ());
+	double const up = c->internal_to_interface (c->upper ());
 
 	_adjustment.set_lower (lo);
 	_adjustment.set_upper (up);
 	_adjustment.set_step_increment ((up - lo) / 100);
 	_adjustment.set_page_increment ((up - lo) / 10);
-	_slider.set_default_value (c->user_to_ui (c->normal ()));
+	_slider.set_default_value (c->internal_to_interface (c->normal ()));
 
 	_adjustment.signal_value_changed().connect (sigc::mem_fun (*this, &Control::slider_adjusted));
 	c->Changed.connect (_connection, MISSING_INVALIDATOR, boost::bind (&Control::control_changed, this), gui_context ());
@@ -419,7 +419,7 @@ ProcessorEntry::Control::slider_adjusted ()
 		return;
 	}
 
-	c->set_value (c->ui_to_user (_adjustment.get_value ()));
+	c->set_value (c->interface_to_internal (_adjustment.get_value ()));
 }
 
 void
@@ -432,14 +432,12 @@ ProcessorEntry::Control::control_changed ()
 
 	_ignore_slider_adjustment = true;
 
-	_adjustment.set_value (c->user_to_ui (c->get_value ()));
+	_adjustment.set_value (c->internal_to_interface (c->get_value ()));
 
-	/* XXX: general presentation of values to the user */
 	stringstream s;
 	s.precision (1);
 	s.setf (ios::fixed, ios::floatfield);
-	s << accurate_coefficient_to_dB (c->get_value ());
-	s << _("dB");
+	s << c->internal_to_user (c->get_value ());
 	
 	_slider.set_tooltip_text (s.str ());