From b6de89d35c370c15e95008ce9e1c5307d8732e63 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 12 Aug 2021 10:06:12 -0600 Subject: [PATCH] post-rebase manual fixups (libs) --- libs/ardour/audioregion.cc | 2 +- libs/ardour/session_state.cc | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index b26212f2fd..db52df4839 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -1486,7 +1486,7 @@ AudioRegion::loudness (float& tp, float& i, float& s, float& m, Progress* p) con ARDOUR::AnalysisGraph ag (&_session); tp = i = s = m = -200; - ag.set_total_samples (_length); + ag.set_total_samples (length_samples()); ag.analyze_region (this, true, p); if (p && p->cancelled ()) { diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 5577fc9c1c..215c28585a 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -1737,7 +1737,8 @@ Session::set_state (const XMLNode& node, int version) if (!r->whole_file ()) { continue; } - for (uint32_t n = 0; n < r->n_channels (); ++n) { + SourceList::size_type sz = r->sources().size(); + for (uint32_t n = 0; n < sz; ++n) { SourceMap::iterator j = src_map.find (r->source(n)->id()); if (j != src_map.end ()) { /* found whole-file region for given source */ @@ -1762,7 +1763,7 @@ Session::set_state (const XMLNode& node, int version) plist.add (Properties::whole_file, true); plist.add (Properties::automatic, true); plist.add (Properties::start, 0); - plist.add (Properties::length, afs->length (0)); + plist.add (Properties::length, afs->length ()); plist.add (Properties::layer, 0); SourceList srcs;