diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-10-09 03:34:13 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-10-09 03:34:13 +1100 |
| commit | b1df56d531869ef737268b2152d79e71c817e27b (patch) | |
| tree | babe2ce1c1d8e2cdfc6fe17f0e03547039f043cd /libs/ardour/region.cc | |
| parent | d8ef41208901db7cb3d6fd0684b403045072b560 (diff) | |
Ensure we have a region _beat for legacy sessions, set _pulse unconditionally when loading from xml.
Diffstat (limited to 'libs/ardour/region.cc')
| -rw-r--r-- | libs/ardour/region.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index dd561be7b0..d602bc2e55 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1311,13 +1311,15 @@ Region::_set_state (const XMLNode& node, int /*version*/, PropertyChange& what_c &bbt_time.beats, &bbt_time.ticks) != 3) { _position_lock_style = AudioTime; + _beat = _session.tempo_map().beat_at_frame (_position); } else { _beat = _session.tempo_map().beat_at_bbt (bbt_time); - _pulse = _session.tempo_map().pulse_at_beat (_beat); } } } + _pulse = _session.tempo_map().pulse_at_beat (_beat); + /* fix problems with old sessions corrupted by impossible values for _stretch or _shift */ |