clear up _initial vs _locked_to_meter TempoSection ambiguity.
This commit is contained in:
parent
28058f6302
commit
ce54a23a36
@ -1462,7 +1462,7 @@ TempoMap::recompute_meters (Metrics& metrics)
|
|||||||
TempoSection* t;
|
TempoSection* t;
|
||||||
if ((*ii)->is_tempo()) {
|
if ((*ii)->is_tempo()) {
|
||||||
t = static_cast<TempoSection*> (*ii);
|
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;
|
meter_locked_tempo = t;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -2824,7 +2824,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou
|
|||||||
TempoSection* t;
|
TempoSection* t;
|
||||||
if ((*ii)->is_tempo()) {
|
if ((*ii)->is_tempo()) {
|
||||||
t = static_cast<TempoSection*> (*ii);
|
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;
|
meter_locked_tempo = t;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -3000,7 +3000,7 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti
|
|||||||
TempoSection* t;
|
TempoSection* t;
|
||||||
if ((*ii)->is_tempo()) {
|
if ((*ii)->is_tempo()) {
|
||||||
t = static_cast<TempoSection*> (*ii);
|
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;
|
meter_locked_tempo = t;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user