Pan: remove/consolidate parameter-descriptor

14 files changed, 9 insertions, 65 deletions

diff --git a/gtk2_ardour/panner2d.cc b/gtk2_ardour/panner2d.cc
index 69326f8fba..0100faa684 100644
--- a/gtk2_ardour/panner2d.cc
+++ b/gtk2_ardour/panner2d.cc
@@ -928,7 +928,7 @@ Panner2dWindow::Panner2dWindow (boost::shared_ptr<PannerShell> p, int32_t h, uin
 	left_side.pack_start (button_box, false, false);
 
 	Gtk::Label* l = manage (new Label (
-				p->panner()->describe_parameter(PanWidthAutomation),
+				p->pannable()->describe_parameter(PanWidthAutomation),
 				Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER, false));
 	spinner_box.pack_start (*l, false, false);
 	spinner_box.pack_start (width_spinner, false, false);
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 7ef0ebd4b5..4f838faaf2 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -1829,7 +1829,7 @@ RouteTimeAxisView::ensure_pan_views (bool show)
 
 			/* we don't already have an AutomationTimeAxisView for this parameter */
 
-			std::string const name = _route->panner()->describe_parameter (pan_control->parameter ());
+			std::string const name = _route->pannable()->describe_parameter (pan_control->parameter ());
 
 			boost::shared_ptr<AutomationTimeAxisView> t (
 					new AutomationTimeAxisView (_session,
diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h
index 417530e43f..c7a0969091 100644
--- a/libs/ardour/ardour/pannable.h
+++ b/libs/ardour/ardour/pannable.h
@@ -64,7 +64,6 @@ public:
 		return ((_auto_state & Write) || ((_auto_state & (Touch | Latch)) && touching()));
 	}
 
-
 	void start_touch (double when);
 	void stop_touch (double when);
 	bool touching() const { return g_atomic_int_get (const_cast<gint*>(&_touching)); }
diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h
index ad6977a480..c1f925df92 100644
--- a/libs/ardour/ardour/panner.h
+++ b/libs/ardour/ardour/panner.h
@@ -111,7 +111,6 @@ public:
 	AutoState automation_state() const;
 
 	virtual std::set<Evoral::Parameter> what_can_be_automated() const;
-	virtual std::string describe_parameter (Evoral::Parameter);
 
 	bool touching() const;
 
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index 6b4c43fc3e..1ff86e2ef4 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -198,6 +198,12 @@ Automatable::describe_parameter (Evoral::Parameter param)
 		return _("Trim");
 	} else if (param.type() == MuteAutomation) {
 		return _("Mute");
+	} else if (param.type() == PanAzimuthAutomation) {
+		return _("Azimuth");
+	} else if (param.type() == PanWidthAutomation) {
+		return _("Width");
+	} else if (param.type() == PanElevationAutomation) {
+		return _("Elevation");
 	} else if (param.type() == MidiCCAutomation) {
 		return string_compose("Controller %1 [%2]", param.id(), int(param.channel()) + 1);
 	} else if (param.type() == MidiPgmChangeAutomation) {
@@ -553,7 +559,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
 	} else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) {
 		Pannable* pannable = dynamic_cast<Pannable*>(this);
 		if (pannable) {
-			control = new PanControllable (_a_session, pannable->describe_parameter (param), pannable, param);
+			control = new PanControllable (_a_session, describe_parameter (param), pannable, param);
 		} else {
 			warning << "PanAutomation for non-Pannable" << endl;
 		}
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index 28d862d2db..c0e93fcc91 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -92,12 +92,6 @@ Panner::what_can_be_automated() const
 	return _pannable->what_can_be_automated ();
 }
 
-string
-Panner::describe_parameter (Evoral::Parameter p)
-{
-	return _pannable->describe_parameter (p);
-}
-
 int
 Panner::set_state (XMLNode const &, int)
 {
diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc
index 64465a84d1..3e4ebd8d82 100644
--- a/libs/panners/1in2out/panner_1in2out.cc
+++ b/libs/panners/1in2out/panner_1in2out.cc
@@ -352,17 +352,6 @@ Panner1in2out::what_can_be_automated() const
 }
 
 string
-Panner1in2out::describe_parameter (Evoral::Parameter p)
-{
-        switch (p.type()) {
-        case PanAzimuthAutomation:
-                return _("L/R");
-        default:
-                return _pannable->describe_parameter (p);
-        }
-}
-
-string
 Panner1in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h
index e164f5579d..93112e1527 100644
--- a/libs/panners/1in2out/panner_1in2out.h
+++ b/libs/panners/1in2out/panner_1in2out.h
@@ -56,7 +56,6 @@ class Panner1in2out : public Panner
 
 	static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-	std::string describe_parameter (Evoral::Parameter);
 	std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
 	XMLNode& get_state ();
diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc
index 8c2cf9dd1e..da47228fbb 100644
--- a/libs/panners/2in2out/panner_2in2out.cc
+++ b/libs/panners/2in2out/panner_2in2out.cc
@@ -496,19 +496,6 @@ Panner2in2out::what_can_be_automated() const
 }
 
 string
-Panner2in2out::describe_parameter (Evoral::Parameter p)
-{
-        switch (p.type()) {
-        case PanAzimuthAutomation:
-                return _("L/R");
-        case PanWidthAutomation:
-                return _("Width");
-        default:
-                return _pannable->describe_parameter (p);
-        }
-}
-
-string
 Panner2in2out::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h
index 1ff8179d3b..f41944a911 100644
--- a/libs/panners/2in2out/panner_2in2out.h
+++ b/libs/panners/2in2out/panner_2in2out.h
@@ -62,7 +62,6 @@ class Panner2in2out : public Panner
 
 	static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-	std::string describe_parameter (Evoral::Parameter);
 	std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
 	XMLNode& get_state ();
diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc
index e9fa140e59..73a3022a12 100644
--- a/libs/panners/stereobalance/panner_balance.cc
+++ b/libs/panners/stereobalance/panner_balance.cc
@@ -284,17 +284,6 @@ Pannerbalance::what_can_be_automated() const
 }
 
 string
-Pannerbalance::describe_parameter (Evoral::Parameter p)
-{
-	switch (p.type()) {
-		case PanAzimuthAutomation:
-			return _("L/R");
-		default:
-			return _pannable->describe_parameter (p);
-	}
-}
-
-string
 Pannerbalance::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
 	/* DO NOT USE LocaleGuard HERE */
diff --git a/libs/panners/stereobalance/panner_balance.h b/libs/panners/stereobalance/panner_balance.h
index ea65497f63..db41502cbc 100644
--- a/libs/panners/stereobalance/panner_balance.h
+++ b/libs/panners/stereobalance/panner_balance.h
@@ -54,7 +54,6 @@ class Pannerbalance : public Panner
 
 	static Panner* factory (boost::shared_ptr<Pannable>, boost::shared_ptr<Speakers>);
 
-	std::string describe_parameter (Evoral::Parameter);
 	std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
 	XMLNode& get_state ();
diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc
index e6b22ccc48..da48b46fa0 100644
--- a/libs/panners/vbap/vbap.cc
+++ b/libs/panners/vbap/vbap.cc
@@ -407,21 +407,6 @@ VBAPanner::what_can_be_automated() const
 }
 
 string
-VBAPanner::describe_parameter (Evoral::Parameter p)
-{
-        switch (p.type()) {
-        case PanAzimuthAutomation:
-                return _("Azimuth");
-        case PanWidthAutomation:
-                return _("Width");
-        case PanElevationAutomation:
-                return _("Elevation");
-        default:
-                return _pannable->describe_parameter (p);
-        }
-}
-
-string
 VBAPanner::value_as_string (boost::shared_ptr<const AutomationControl> ac) const
 {
         /* DO NOT USE LocaleGuard HERE */
diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h
index 575fc09e3e..fb96de8715 100644
--- a/libs/panners/vbap/vbap.h
+++ b/libs/panners/vbap/vbap.h
@@ -57,7 +57,6 @@ public:
 
 	void set_azimuth_elevation (double azimuth, double elevation);
 
-        std::string describe_parameter (Evoral::Parameter);
         std::string value_as_string (boost::shared_ptr<const AutomationControl>) const;
 
 	XMLNode& get_state ();