diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-05 21:24:26 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-01-05 21:24:26 +0000 |
| commit | 9829a695491e519b0b0f7ab1ff4be4f02256b3ed (patch) | |
| tree | ddde5ffa7956c435586f710e00a22a2b15a240e2 | |
| parent | 862299120c3a0218046a3a0cfa9427f8f51e856d (diff) | |
fix over-zealous optimization in tempo map, caused crash
git-svn-id: svn://localhost/ardour2/branches/3.0@11168 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/tempo.cc | 12 | ||||
| -rw-r--r-- | wscript | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 85468b8145..73dc998732 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -732,12 +732,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) BBT_Time current; Metrics::iterator next_metric; - if (end == 0) { - /* silly call from Session::process() during startup - */ - return; - } - if (end < 0) { if (_map.empty()) { @@ -815,6 +809,12 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add first bar at 1|1 @ %2\n", current.bars, current_frame)); _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), 1, 1)); + if (end == 0) { + /* silly call from Session::process() during startup + */ + return; + } + _extend_map (tempo, meter, next_metric, current, current_frame, end); } @@ -8,7 +8,7 @@ import subprocess import sys # Variables for 'waf dist' -VERSION = '3.0beta1a' +VERSION = '3.0beta2' APPNAME = 'Ardour3' # Mandatory variables |