diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-05 05:05:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-05 05:05:31 +0000 |
| commit | e0b694f630e31039e082c1ce640dfaf85bfede3c (patch) | |
| tree | 13eae2b01c2ea916199f7930afe9789a0cedf825 /libs/ardour/region.cc | |
| parent | 4e4306d1251aedc294ae8e041f855d136f1c7e8f (diff) | |
possibly fix deadlocking issues with tempo map by rearranging code and adding RT variants for a couple of functions that would normally try to rebuild the map when necessary; instead the variants throw an exception and the RT code that called them tries to do something reasonable
git-svn-id: svn://localhost/ardour2/branches/3.0@11164 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index d863a0e6fd..66c0b84ae9 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -547,7 +547,7 @@ Region::set_position_lock_style (PositionLockStyle ps) _position_lock_style = ps; if (_position_lock_style == MusicTime) { - _session.tempo_map().bbt_time (_position, _bbt_time); + _session.bbt_time (_position, _bbt_time); } send_change (Properties::position_lock_style); @@ -624,7 +624,7 @@ void Region::recompute_position_from_lock_style () { if (_position_lock_style == MusicTime) { - _session.tempo_map().bbt_time (_position, _bbt_time); + _session.bbt_time (_position, _bbt_time); } } |