summaryrefslogtreecommitdiff
path: root/nutemp
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-13 19:34:54 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 11:40:54 -0400
commit73d0a849b8b88c68b011e7ac668eaf39cd1c9f48 (patch)
treebb326fb03606a61788a3db699effe439c422a73e /nutemp
parentcba53a20233531ef3e6c3692993eac8f74e991a1 (diff)
add a _locked variant for TempoMap::dump()
Diffstat (limited to 'nutemp')
-rw-r--r--nutemp/t.cc13
-rw-r--r--nutemp/t.h1
2 files changed, 11 insertions, 3 deletions
diff --git a/nutemp/t.cc b/nutemp/t.cc
index 8741377d7b..6e4ee6a6e6 100644
--- a/nutemp/t.cc
+++ b/nutemp/t.cc
@@ -480,7 +480,7 @@ TempoMap::rebuild_locked (superclock_t limit)
*/
cerr << "POST-SORT\n";
- dump (cerr);
+ dump_locked (cerr);
prev = _points.end();
@@ -1033,10 +1033,17 @@ TempoMap::set_sample_rate (framecnt_t new_sr)
i->map_reset_set_sclock_for_sr_change (llrint (ratio * i->sclock()));
}
}
- void
+
+void
+TempoMap::dump (std::ostream& ostr)
+{
+ Glib::Threads::RWLock::ReaderLock lm (_lock);
+ dump_locked (ostr);
+}
+
+void
TempoMap::dump (std::ostream& ostr)
{
- //Glib::Threads::RWLock::ReaderLock lm (_lock);
ostr << "\n\n------------\n";
for (TempoMapPoints::iterator i = _points.begin(); i != _points.end(); ++i) {
ostr << *i << std::endl;
diff --git a/nutemp/t.h b/nutemp/t.h
index 645893f51c..db3cb44954 100644
--- a/nutemp/t.h
+++ b/nutemp/t.h
@@ -391,6 +391,7 @@ class LIBARDOUR_API TempoMap
void move_explicit_to (TempoMapPoints::iterator, superclock_t destination);
void rebuild_locked (superclock_t limit);
+ void dump_locked (std::ostream&);
};
}