smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 00:34:59 +01:00
Code Issues Projects Releases Wiki Activity

post-rebase manual fixups (libs)

Browse source
This commit is contained in:
Paul Davis 2021-08-12 10:06:12 -06:00
parent ec4e09c12a
commit b6de89d35c
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/audioregion.cc
View file

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

5
libs/ardour/session_state.cc
View file

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