From: Carl Hetherington <carl@carlh.net>
Date: Tue, 24 Jan 2012 22:42:43 +0000 (+0000)
Subject: Move reader lock to avoid deadlock when calling bbt_time().
X-Git-Tag: 3.0-beta3~97
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=275e710e671409421b6a1155bfeeff0d4580a87a;p=ardour.git

Move reader lock to avoid deadlock when calling bbt_time().


git-svn-id: svn://localhost/ardour2/branches/3.0@11342 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 9a4877c451..ef74c09c27 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -1187,14 +1187,11 @@ TempoMap::frame_time (const BBT_Time& bbt)
 framecnt_t
 TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir)
 {
-	Glib::RWLock::ReaderLock lm (lock);
-	framecnt_t frames = 0;
 	BBT_Time when;
-
 	bbt_time (pos, when);
-	frames = bbt_duration_at_unlocked (when, bbt,dir);
-
-	return frames;
+	
+	Glib::RWLock::ReaderLock lm (lock);
+	return bbt_duration_at_unlocked (when, bbt, dir);
 }
 
 framecnt_t