allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6393 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2009-12-23 00:51:26 +00:00
parent 24c0654fd5
commit be8a2e20dc
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/meter.h
View File

@@ -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;

8
libs/ardour/meter.cc
View File

@@ -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) {