ardour/livetrax
13
0
Fork 0
Code

clear up _initial vs _locked_to_meter TempoSection ambiguity.

Browse Source
This commit is contained in:
nick_m 2017-01-07 02:29:14 +11:00
parent 28058f6302
commit ce54a23a36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ardour/tempo.cc
View File

@ -1462,7 +1462,7 @@ TempoMap::recompute_meters (Metrics& metrics)
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
if ((t->locked_to_meter() || t->initial()) && t->frame() == meter->frame()) {
if (t->locked_to_meter() && t->frame() == meter->frame()) {
meter_locked_tempo = t;
break;
}
@ -2824,7 +2824,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
if ((t->locked_to_meter() || t->initial()) && t->frame() == section->frame()) {
if (t->locked_to_meter() && t->frame() == section->frame()) {
meter_locked_tempo = t;
break;
}
@ -3000,7 +3000,7 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti
TempoSection* t;
if ((*ii)->is_tempo()) {
t = static_cast<TempoSection*> (*ii);
if ((t->locked_to_meter() || t->initial()) && t->frame() == m->frame()) {
if (t->locked_to_meter() && t->frame() == m->frame()) {
meter_locked_tempo = t;
break;
}