From 22a20c7333a14ac0c4af20287d8643e07ff92903 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Mon, 25 Jan 2016 11:47:21 -0500
Subject: change exposed type of various objects' gain controls; remove
 Amp::gain() as a shortcut

---
 libs/ardour/route.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libs/ardour/route.cc')

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 8dfdcb25db..75f58b528a 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -410,7 +410,7 @@ Route::set_gain (gain_t val, Controllable::GroupControlDisposition group_overrid
 
 		if (_route_group->is_relative()) {
 
-			gain_t usable_gain = _amp->gain();
+			gain_t usable_gain = _gain_control->get_value();
 			if (usable_gain < 0.000001f) {
 				usable_gain = 0.000001f;
 			}
@@ -4448,13 +4448,13 @@ Route::panner_shell() const
 	return _main_outs->panner_shell();
 }
 
-boost::shared_ptr<AutomationControl>
+boost::shared_ptr<GainControl>
 Route::gain_control() const
 {
 	return _gain_control;
 }
 
-boost::shared_ptr<AutomationControl>
+boost::shared_ptr<GainControl>
 Route::trim_control() const
 {
 	return _trim_control;
-- 
cgit v1.2.3