merge fix for tempo branch

1 files changed, 27 insertions, 0 deletions

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 521b91147d..c5f7272b7e 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1620,6 +1620,33 @@ TempoMap::tempo_at (framepos_t frame) const
 	return m.tempo();
 }
 
+const MeterSection&
+TempoMap::meter_section_at (framepos_t frame) const
+{
+	Glib::Threads::RWLock::ReaderLock lm (lock);
+	Metrics::const_iterator i;
+	MeterSection* prev = 0;
+
+	for (i = metrics.begin(); i != metrics.end(); ++i) {
+		MeterSection* t;
+
+		if ((t = dynamic_cast<MeterSection*> (*i)) != 0) {
+
+			if ((*i)->frame() > frame) {
+				break;
+			}
+
+			prev = t;
+		}
+	}
+
+	if (prev == 0) {
+		fatal << endmsg;
+		abort(); /*NOTREACHED*/
+	}
+
+	return *prev;
+}
 
 const Meter&
 TempoMap::meter_at (framepos_t frame) const