projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a53d94c
)
Tempo cramps - do not allow tempos to share the same frame.
author
nick_m
<mainsbridge@gmail.com>
Tue, 29 Mar 2016 11:09:39 +0000
(22:09 +1100)
committer
nick_m
<mainsbridge@gmail.com>
Fri, 27 May 2016 13:38:13 +0000
(23:38 +1000)
libs/ardour/tempo.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/tempo.cc
b/libs/ardour/tempo.cc
index ce9a8d95134f1eb97af73035388f1a9629a4c8d3..2f1678467e018e5e506115280b077fe02ac1d513 100644
(file)
--- a/
libs/ardour/tempo.cc
+++ b/
libs/ardour/tempo.cc
@@
-1988,6
+1988,11
@@
TempoMap::check_solved (Metrics& metrics, bool by_frame)
if ((by_frame && t->frame() < prev_ts->frame()) || (!by_frame && t->pulse() < prev_ts->pulse())) {
return false;
}
+
+ if (t->frame() == prev_ts->frame()) {
+ return false;
+ }
+
/* precision check ensures pulses and frames align independent of lock style.*/
if (by_frame && t->frame() != prev_ts->frame_at_pulse (t->pulse(), _frame_rate)) {
return false;