ardour/livetrax
13
0
Fork 0
Code

fix over-zealous optimization in tempo map, caused crash

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11168 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-05 21:24:26 +00:00
parent 862299120c
commit 9829a69549
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/tempo.cc
View File

@ -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);
}

2
wscript
View File

@ -8,7 +8,7 @@ import subprocess
import sys
# Variables for 'waf dist'
VERSION = '3.0beta1a'
VERSION = '3.0beta2'
APPNAME = 'Ardour3'
# Mandatory variables