summaryrefslogtreecommitdiff
path: root/libs/ardour/meter.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2009-12-23 00:51:26 +0000
committerCarl Hetherington <carl@carlh.net>2009-12-23 00:51:26 +0000
commitbe8a2e20dcacfc980c8de0341165b0be67ce35fd (patch)
tree350a57262d903f1964ac33e2b2917e1760683413 /libs/ardour/meter.cc
parent24c0654fd5ec04066f139f9684496f5fe2ed9422 (diff)
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
Diffstat (limited to 'libs/ardour/meter.cc')
-rw-r--r--libs/ardour/meter.cc8
1 files changed, 4 insertions, 4 deletions
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) {