summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/tempo.cc12
-rw-r--r--wscript2
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);
}
diff --git a/wscript b/wscript
index e797a2f3ee..1569099666 100644
--- a/wscript
+++ b/wscript
@@ -8,7 +8,7 @@ import subprocess
import sys
# Variables for 'waf dist'
-VERSION = '3.0beta1a'
+VERSION = '3.0beta2'
APPNAME = 'Ardour3'
# Mandatory variables