Fix assertion failure on dropping a track out of rec-arm.

git-svn-id: svn://localhost/ardour2/branches/3.0@6393 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 2a283c0c641af5e84ef1334131489b88282ef396..478a88efcfa86c6524d2b3ff5400d39384174450 100644 (file)
--- 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 580fd7804cfa965d19650ccba9efa6ea82bf016c..e49b69574e3e8bfbcc19e5deba9f235df4bda71a 100644 (file)
--- 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) {