Update GUI: meter-type API and meter-type state changes

This removes all additional GUI side meter-type state.
The route's meter-processors is now responsible for providing
the type.

meter-type is now implicit for GainMeter, LevelMeter used by
meter-strips and mixer-strips.

1 files changed, 2 insertions, 21 deletions

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 0475b7115d..35cb66407b 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -384,12 +384,6 @@ GainMeterBase::setup_meters (int len)
 }
 
 void
-GainMeterBase::set_type (MeterType t)
-{
-	level_meter->set_meter_type(t);
-}
-
-void
 GainMeter::setup_meters (int len)
 {
 	switch (_width) {
@@ -411,12 +405,6 @@ GainMeter::setup_meters (int len)
 	GainMeterBase::setup_meters (len);
 }
 
-void
-GainMeter::set_type (MeterType t)
-{
-	GainMeterBase::set_type (t);
-}
-
 bool
 GainMeterBase::gain_key_press (GdkEventKey* ev)
 {
@@ -971,8 +959,8 @@ GainMeter::set_controls (boost::shared_ptr<Route> r,
 		_meter->ConfigurationChanged.connect (
 			model_connections, invalidator (*this), boost::bind (&GainMeter::meter_configuration_changed, this, _1), gui_context()
 			);
-		_meter->TypeChanged.connect (
-			model_connections, invalidator (*this), boost::bind (&GainMeter::meter_type_changed, this, _1), gui_context()
+		_meter->MeterTypeChanged.connect (
+			model_connections, invalidator (*this), boost::bind (&GainMeter::redraw_metrics, this), gui_context()
 			);
 
 		meter_configuration_changed (_meter->input_streams ());
@@ -1129,10 +1117,3 @@ GainMeter::route_active_changed ()
 		meter_configuration_changed (_meter->input_streams ());
 	}
 }
-
-void
-GainMeter::meter_type_changed (MeterType t)
-{
-	_route->set_meter_type(t);
-	RedrawMetrics();
-}