use redesigned Route and VCA object architecture/API

diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc
index 57b874e87bed9ea94aea38094b766293753901d4..5470232ad795474703572a6702b7c4adb4673a79 100644 (file)
--- a/libs/surfaces/control_protocol/control_protocol.cc
+++ b/libs/surfaces/control_protocol/control_protocol.cc
@@ -282,10 +282,9 @@ ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t whic
                return 0.0f;
        }
 
-       return r->peak_meter().meter_level (which_input, MeterPeak);
+       return r->peak_meter()->meter_level (which_input, MeterPeak);
 }
 
-
 bool
 ControlProtocol::route_get_muted (uint32_t table_index)
 {

diff --git a/libs/surfaces/mackie/strip.cc b/libs/surfaces/mackie/strip.cc
index 7de5f747019238fe50c7e01d43b871619dccd2df..fa36ee46b0969877a6cdcf269b07c2039ebafd70 100644 (file)
--- a/libs/surfaces/mackie/strip.cc
+++ b/libs/surfaces/mackie/strip.cc
@@ -1227,7 +1227,7 @@ Strip::update_meter ()
        }
 
        if (_meter && _transport_is_rolling && _metering_active) {
-               float dB = const_cast<PeakMeter&> (_route->peak_meter()).meter_level (0, MeterMCP);
+               float dB = _route->peak_meter()->meter_level (0, MeterMCP);
                _meter->send_update (*_surface, dB);
                return;
        }