diff options
| -rw-r--r-- | libs/ardour/ardour/meter.h | 5 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 2a283c0c64..478a88efcf 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -71,6 +71,9 @@ public: /** Compute peaks */ void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes, bool); + ChanCount input_streams () const { return current_meters; } + ChanCount output_streams () const { return current_meters; } + float peak_power (uint32_t n) { if (n < _visible_peak_power.size()) { return _visible_peak_power[n]; @@ -92,7 +95,7 @@ public: private: friend class IO; - uint32_t current_meters; + ChanCount current_meters; std::vector<float> _peak_power; std::vector<float> _visible_peak_power; diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 580fd7804c..e49b69574e 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -36,7 +36,7 @@ PBD::Signal0<void> Metering::Meter; PeakMeter::PeakMeter (Session& s, const XMLNode& node) : Processor (s, node) { - current_meters = 0; + } /** Get peaks from @a bufs @@ -119,7 +119,7 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) return false; } - current_meters = in.n_total (); + current_meters = in; return Processor::configure_io (in, out); } @@ -127,7 +127,7 @@ PeakMeter::configure_io (ChanCount in, ChanCount out) void PeakMeter::reflect_inputs (const ChanCount& in) { - current_meters = in.n_total (); + current_meters = in; } void @@ -166,7 +166,7 @@ PeakMeter::meter () assert(_visible_peak_power.size() == _peak_power.size()); - const size_t limit = min (_peak_power.size(), (size_t) current_meters); + const size_t limit = min (_peak_power.size(), (size_t) current_meters.n_total ()); for (size_t n = 0; n < limit; ++n) { |