possibly fix deadlocking issues with tempo map by rearranging code and adding RT...

[ardour.git] / libs / ardour / location.cc

diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc
index b6a09d863ab189a5e3ea1a84209c6ad4ad02f366..e909957e0d9daaf27e1b67cd34504e6fec4f111c 100644 (file)
--- a/libs/ardour/location.cc
+++ b/libs/ardour/location.cc
@@ -419,10 +419,8 @@ Location::set_state (const XMLNode& node, int /*version*/)
                return -1;
        }
 
-       if ((prop = node.property ("id")) == 0) {
+       if (!set_id (node)) {
                warning << _("XML node for Location has no ID information") << endmsg;
-       } else {
-               _id = prop->value ();
        }
 
        if ((prop = node.property ("name")) == 0) {
@@ -522,8 +520,8 @@ Location::recompute_bbt_from_frames ()
                return;
        }
 
-       _session.tempo_map().bbt_time (_start, _bbt_start);
-       _session.tempo_map().bbt_time (_end, _bbt_end);
+       _session.bbt_time (_start, _bbt_start);
+       _session.bbt_time (_end, _bbt_end);
 }
 
 void