diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-03-07 15:00:17 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-05-31 15:30:39 -0400 |
commit | aee283f056e387266c23213903f97034f632cac1 (patch) | |
tree | 5b67e2186360bbd8bd08e0182d73ef8c50365650 /libs | |
parent | 406e9d05ce4d54a7a8a1536803a99243e7bf6881 (diff) |
use redesigned Route and VCA object architecture/API
Diffstat (limited to 'libs')
-rw-r--r-- | libs/surfaces/control_protocol/control_protocol.cc | 3 | ||||
-rw-r--r-- | libs/surfaces/mackie/strip.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 57b874e87b..5470232ad7 100644 --- 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 7de5f74701..fa36ee46b0 100644 --- 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; } |