diff options
| author | Robin Gareus <robin@gareus.org> | 2019-06-09 17:47:21 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-06-09 19:56:15 +0200 |
| commit | cd5b0819bf1242240c60d2da4862abc65ce548e6 (patch) | |
| tree | 04b77bbe6a7d53a0cb7b1bc2061193ce5a426a37 /libs/ardour/meter.cc | |
| parent | 1cec6d1250de9e17075c563775aa7fe2c424b596 (diff) | |
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.
Diffstat (limited to 'libs/ardour/meter.cc')
| -rw-r--r-- | libs/ardour/meter.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index a514deaa6b..2becd2bb87 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -403,7 +403,7 @@ PeakMeter::meter_level(uint32_t n, MeterType type) { } void -PeakMeter::set_type(MeterType t) +PeakMeter::set_meter_type (MeterType t) { if (t == _meter_type) { return; @@ -436,7 +436,7 @@ PeakMeter::set_type(MeterType t) } } - TypeChanged(t); + MeterTypeChanged (t); /* EMIT SIGNAL */ } XMLNode& |