Consolidate meter-type state and API

In theory different UIs can show different meter-types, so it
can make sense to maintain the type in different places.
MeterType is a bit-set and PeakMeter implementation provides for this.

However, this is not being used, and the current implementation
was rather fragmented, cross-connected signals to keep types in sync,
allowed inconsistent meter-types in GUI and backend.

MeterType is now kept by meter itself, however it is still
saved/restored as part of the Route state.

N.B. This change breaks the API, various methods have been renamed
for consistency.

1 files changed, 3 insertions, 3 deletions

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 1f7ad30216..6b95471fd1 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -74,11 +74,11 @@ public:
 
 	float meter_level (uint32_t n, MeterType type);
 
-	void set_type(MeterType t);
-	MeterType get_type() { return _meter_type; }
+	void set_meter_type (MeterType t);
+	MeterType meter_type () const { return _meter_type; }
 
 
-	PBD::Signal1<void, MeterType> TypeChanged;
+	PBD::Signal1<void, MeterType> MeterTypeChanged;
 
 protected:
 	XMLNode& state ();