X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftempo.cc;h=30b4935c3de1557c2ed4e16d4dbe1cb1e14ee107;hb=8724a9f68f2854be6c3c70f15efda8076ef5db1d;hp=f613336808265a245b86d8a8d1383f88db6bd61a;hpb=324e51c73431199c25f7be390aafd964aa3d7c86;p=ardour.git diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index f613336808..30b4935c3d 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -77,6 +77,7 @@ TempoSection::TempoSection (const XMLNode& node) , Tempo (TempoMap::default_tempo()) , _c_func (0.0) , _active (true) + , _locked_to_meter (false) { const XMLProperty *prop; LocaleGuard lg; @@ -84,6 +85,8 @@ TempoSection::TempoSection (const XMLNode& node) double pulse; uint32_t frame; + _legacy_bbt = BBT_Time (0, 0, 0); + if ((prop = node.property ("start")) != 0) { if (sscanf (prop->value().c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &bbt.bars, @@ -92,20 +95,18 @@ TempoSection::TempoSection (const XMLNode& node) /* legacy session - start used to be in bbt*/ _legacy_bbt = bbt; pulse = -1.0; - set_pulse (pulse); + info << _("Legacy session detected. TempoSection XML node will be altered.") << endmsg; } - } else { - warning << _("TempoSection XML node has no \"start\" property") << endmsg; } - if ((prop = node.property ("pulse")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &pulse) != 1 || pulse < 0.0) { - error << _("TempoSection XML node has an illegal \"beat\" value") << endmsg; - } else { - set_pulse (pulse); + if (sscanf (prop->value().c_str(), "%lf", &pulse) != 1) { + error << _("TempoSection XML node has an illegal \"pulse\" value") << endmsg; } } + + set_pulse (pulse); + if ((prop = node.property ("frame")) != 0) { if (sscanf (prop->value().c_str(), "%" PRIu32, &frame) != 1) { error << _("TempoSection XML node has an illegal \"frame\" value") << endmsg; @@ -155,10 +156,20 @@ TempoSection::TempoSection (const XMLNode& node) } if ((prop = node.property ("lock-style")) == 0) { - set_position_lock_style (MusicTime); + if (movable()) { + set_position_lock_style (MusicTime); + } else { + set_position_lock_style (AudioTime); + } } else { set_position_lock_style (PositionLockStyle (string_2_enum (prop->value(), position_lock_style()))); } + + if ((prop = node.property ("locked-to-meter")) == 0) { + set_locked_to_meter (false); + } else { + set_locked_to_meter (string_is_affirmative (prop->value())); + } } XMLNode& @@ -182,6 +193,7 @@ TempoSection::get_state() const root->add_property ("active", buf); root->add_property ("tempo-type", enum_2_string (_type)); root->add_property ("lock-style", enum_2_string (position_lock_style())); + root->add_property ("locked-to-meter", locked_to_meter()?"yes":"no"); return *root; } @@ -198,7 +210,7 @@ double TempoSection::tempo_at_frame (const framepos_t& f, const framecnt_t& frame_rate) const { - if (_type == Constant) { + if (_type == Constant || _c_func == 0.0) { return pulses_per_minute(); } @@ -213,7 +225,7 @@ TempoSection::tempo_at_frame (const framepos_t& f, const framecnt_t& frame_rate) framepos_t TempoSection::frame_at_tempo (const double& ppm, const double& b, const framecnt_t& frame_rate) const { - if (_type == Constant) { + if (_type == Constant || _c_func == 0.0) { return ((b - pulse()) * frames_per_pulse (frame_rate)) + frame(); } @@ -225,7 +237,7 @@ double TempoSection::tempo_at_pulse (const double& p) const { - if (_type == Constant) { + if (_type == Constant || _c_func == 0.0) { return pulses_per_minute(); } double const ppm = pulse_tempo_at_pulse (p - pulse()); @@ -239,11 +251,10 @@ TempoSection::tempo_at_pulse (const double& p) const double TempoSection::pulse_at_tempo (const double& ppm, const framepos_t& f, const framecnt_t& frame_rate) const { - if (_type == Constant) { - double const beats = ((f - frame()) / frames_per_pulse (frame_rate)) + pulse(); - return beats; + if (_type == Constant || _c_func == 0.0) { + double const pulses = ((f - frame()) / frames_per_pulse (frame_rate)) + pulse(); + return pulses; } - return pulse_at_pulse_tempo (ppm) + pulse(); } @@ -254,7 +265,7 @@ TempoSection::pulse_at_tempo (const double& ppm, const framepos_t& f, const fram double TempoSection::pulse_at_frame (const framepos_t& f, const framecnt_t& frame_rate) const { - if (_type == Constant) { + if (_type == Constant || _c_func == 0.0) { return ((f - frame()) / frames_per_pulse (frame_rate)) + pulse(); } @@ -269,7 +280,7 @@ TempoSection::pulse_at_frame (const framepos_t& f, const framecnt_t& frame_rate) framepos_t TempoSection::frame_at_pulse (const double& p, const framecnt_t& frame_rate) const { - if (_type == Constant) { + if (_type == Constant || _c_func == 0.0) { return (framepos_t) floor ((p - pulse()) * frames_per_pulse (frame_rate)) + frame(); } @@ -305,7 +316,7 @@ The integral over t of our Tempo function (the beat function, which is the durat b(t) = T0(e^(ct) - 1) / c To find the time t at beat duration b, we use the inverse function of the beat function (the time function) which can be shown to be: -t(b) = log((cb / T0) + 1) / c +t(b) = log((c.b / T0) + 1) / c The time t at which Tempo T occurs is a as above: t(T) = log(T / T0) / c @@ -325,6 +336,13 @@ t = b log (Ta / T0) / (T0 (e^(log (Ta / T0)) - 1)) By substituting our expanded t as a in the c function above, our problem is reduced to: c = T0 (e^(log (Ta / T0)) - 1) / b +Of course the word 'beat' has been left loosely defined above. +In music, a beat is defined by the musical pulse (which comes from the tempo) +and the meter in use at a particular time (how many pulse divisions there are in one bar). +It would be more accurate to substitute the work 'pulse' for 'beat' above. + +Anyway ... + We can now store c for future time calculations. If the following tempo section (the one that defines c in conjunction with this one) is changed or moved, c is no longer valid. @@ -362,30 +380,30 @@ TempoSection::compute_c_func_frame (const double& end_bpm, const framepos_t& end return c_func (end_bpm, frame_to_minute (end_frame - frame(), frame_rate)); } -framecnt_t +framepos_t TempoSection::minute_to_frame (const double& time, const framecnt_t& frame_rate) const { - return (framecnt_t) floor ((time * 60.0 * frame_rate) + 0.5); + return (framepos_t) floor ((time * 60.0 * frame_rate) + 0.5); } double -TempoSection::frame_to_minute (const framecnt_t& frame, const framecnt_t& frame_rate) const +TempoSection::frame_to_minute (const framepos_t& frame, const framecnt_t& frame_rate) const { return (frame / (double) frame_rate) / 60.0; } /* position function */ double -TempoSection::a_func (double end_bpm, double c_func) const +TempoSection::a_func (double end_ppm, double c_func) const { - return log (end_bpm / pulses_per_minute()) / c_func; + return log (end_ppm / pulses_per_minute()) / c_func; } /*function constant*/ double -TempoSection::c_func (double end_bpm, double end_time) const +TempoSection::c_func (double end_ppm, double end_time) const { - return log (end_bpm / pulses_per_minute()) / end_time; + return log (end_ppm / pulses_per_minute()) / end_time; } /* tempo in ppm at time in minutes */ @@ -455,14 +473,13 @@ MeterSection::MeterSection (const XMLNode& node) error << _("MeterSection XML node has an illegal \"start\" value") << endmsg; } else { /* legacy session - start used to be in bbt*/ + info << _("Legacy session detected - MeterSection XML node will be altered.") << endmsg; pulse = -1.0; } - } else { - error << _("MeterSection XML node has no \"start\" property") << endmsg; } if ((prop = node.property ("pulse")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &pulse) != 1 || pulse < 0.0) { + if (sscanf (prop->value().c_str(), "%lf", &pulse) != 1) { error << _("MeterSection XML node has an illegal \"pulse\" value") << endmsg; } } @@ -470,20 +487,20 @@ MeterSection::MeterSection (const XMLNode& node) if ((prop = node.property ("beat")) != 0) { if (sscanf (prop->value().c_str(), "%lf", &beat) != 1) { - error << _("MeterSection XML node has an illegal \"beat\" vlue") << endmsg; + error << _("MeterSection XML node has an illegal \"beat\" value") << endmsg; } } start.first = beat; if ((prop = node.property ("bbt")) == 0) { - error << _("MeterSection XML node has no \"bbt\" property") << endmsg; + warning << _("MeterSection XML node has no \"bbt\" property") << endmsg; } else if (sscanf (prop->value().c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, &bbt.bars, &bbt.beats, &bbt.ticks) < 3) { error << _("MeterSection XML node has an illegal \"bbt\" value") << endmsg; - //throw failed_constructor(); + throw failed_constructor(); } start.second = bbt; @@ -519,19 +536,23 @@ MeterSection::MeterSection (const XMLNode& node) throw failed_constructor(); } - if ((prop = node.property ("lock-style")) == 0) { - warning << _("MeterSection XML node has no \"lock-style\" property") << endmsg; - set_position_lock_style (MusicTime); - } else { - set_position_lock_style (PositionLockStyle (string_2_enum (prop->value(), position_lock_style()))); - } - if ((prop = node.property ("movable")) == 0) { error << _("MeterSection XML node has no \"movable\" property") << endmsg; throw failed_constructor(); } set_movable (string_is_affirmative (prop->value())); + + if ((prop = node.property ("lock-style")) == 0) { + warning << _("MeterSection XML node has no \"lock-style\" property") << endmsg; + if (movable()) { + set_position_lock_style (MusicTime); + } else { + set_position_lock_style (AudioTime); + } + } else { + set_position_lock_style (PositionLockStyle (string_2_enum (prop->value(), position_lock_style()))); + } } XMLNode& @@ -618,8 +639,8 @@ TempoMap::TempoMap (framecnt_t fr) _frame_rate = fr; BBT_Time start (1, 1, 0); - TempoSection *t = new TempoSection (0.0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Constant); - MeterSection *m = new MeterSection (0.0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor()); + TempoSection *t = new TempoSection ((framepos_t) 0, _default_tempo.beats_per_minute(), _default_tempo.note_type(), TempoSection::Constant); + MeterSection *m = new MeterSection ((framepos_t) 0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor()); t->set_movable (false); m->set_movable (false); @@ -633,6 +654,12 @@ TempoMap::TempoMap (framecnt_t fr) TempoMap::~TempoMap () { + Metrics::const_iterator d = _metrics.begin(); + while (d != _metrics.end()) { + delete (*d); + ++d; + } + _metrics.clear(); } void @@ -663,6 +690,7 @@ TempoMap::remove_tempo_locked (const TempoSection& tempo) if (dynamic_cast (*i) != 0) { if (tempo.frame() == (*i)->frame()) { if ((*i)->movable()) { + delete (*i); _metrics.erase (i); return true; } @@ -693,14 +721,28 @@ TempoMap::remove_meter (const MeterSection& tempo, bool complete_operation) } bool -TempoMap::remove_meter_locked (const MeterSection& tempo) +TempoMap::remove_meter_locked (const MeterSection& meter) { Metrics::iterator i; + for (i = _metrics.begin(); i != _metrics.end(); ++i) { + TempoSection* t = 0; + if ((t = dynamic_cast (*i)) != 0) { + if (meter.frame() == (*i)->frame()) { + if (t->locked_to_meter()) { + delete (*i); + _metrics.erase (i); + break; + } + } + } + } + for (i = _metrics.begin(); i != _metrics.end(); ++i) { if (dynamic_cast (*i) != 0) { - if (tempo.frame() == (*i)->frame()) { + if (meter.frame() == (*i)->frame()) { if ((*i)->movable()) { + delete (*i); _metrics.erase (i); return true; } @@ -720,7 +762,6 @@ TempoMap::do_insert (MetricSection* section) */ MeterSection* m = 0; if ((m = dynamic_cast(section)) != 0) { - //assert (m->bbt().ticks == 0); if ((m->bbt().beats != 1) || (m->bbt().ticks != 0)) { @@ -763,8 +804,13 @@ TempoMap::do_insert (MetricSection* section) *(dynamic_cast(*i)) = *(dynamic_cast(insert_tempo)); (*i)->set_position_lock_style (AudioTime); + TempoSection* t; + if ((t = dynamic_cast(*i)) != 0) { + t->set_type (insert_tempo->type()); + } need_add = false; } else { + delete (*i); _metrics.erase (i); } break; @@ -776,7 +822,7 @@ TempoMap::do_insert (MetricSection* section) bool const ipm = insert_meter->position_lock_style() == MusicTime; - if ((ipm && meter->pulse() == insert_meter->pulse()) || (!ipm && meter->frame() == insert_meter->frame())) { + if ((ipm && meter->beat() == insert_meter->beat()) || (!ipm && meter->frame() == insert_meter->frame())) { if (!meter->movable()) { @@ -786,11 +832,11 @@ TempoMap::do_insert (MetricSection* section) */ *(dynamic_cast(*i)) = *(dynamic_cast(insert_meter)); - (*i)->set_position_lock_style (insert_meter->position_lock_style()); + (*i)->set_position_lock_style (AudioTime); need_add = false; } else { + delete (*i); _metrics.erase (i); - } break; @@ -814,7 +860,7 @@ TempoMap::do_insert (MetricSection* section) if (meter) { bool const ipm = insert_meter->position_lock_style() == MusicTime; - if ((ipm && meter->pulse() > insert_meter->pulse()) || (!ipm && meter->frame() > insert_meter->frame())) { + if ((ipm && meter->beat() > insert_meter->beat()) || (!ipm && meter->frame() > insert_meter->frame())) { break; } } @@ -833,7 +879,7 @@ TempoMap::do_insert (MetricSection* section) } _metrics.insert (i, section); - //dump (_metrics, std::cerr); + //dump (_metrics, std::cout); } } @@ -883,51 +929,63 @@ TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const frame PropertyChanged (PropertyChange ()); } -void +TempoSection* TempoMap::add_tempo (const Tempo& tempo, const double& pulse, ARDOUR::TempoSection::Type type) { + TempoSection* ts = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - add_tempo_locked (tempo, pulse, true, type); + ts = add_tempo_locked (tempo, pulse, true, type); } PropertyChanged (PropertyChange ()); + + return ts; } -void +TempoSection* TempoMap::add_tempo (const Tempo& tempo, const framepos_t& frame, ARDOUR::TempoSection::Type type) { + TempoSection* ts = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - add_tempo_locked (tempo, frame, true, type); + ts = add_tempo_locked (tempo, frame, true, type); } PropertyChanged (PropertyChange ()); + + return ts; } -void +TempoSection* TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, bool recompute, ARDOUR::TempoSection::Type type) { - TempoSection* ts = new TempoSection (pulse, tempo.beats_per_minute(), tempo.note_type(), type); + TempoSection* t = new TempoSection (pulse, tempo.beats_per_minute(), tempo.note_type(), type); - do_insert (ts); + do_insert (t); if (recompute) { - solve_map (_metrics, ts, Tempo (ts->beats_per_minute(), ts->note_type()), ts->pulse()); + solve_map (_metrics, t, t->pulse()); + recompute_meters (_metrics); } + + return t; } -void +TempoSection* TempoMap::add_tempo_locked (const Tempo& tempo, framepos_t frame, bool recompute, ARDOUR::TempoSection::Type type) { - TempoSection* ts = new TempoSection (frame, tempo.beats_per_minute(), tempo.note_type(), type); + TempoSection* t = new TempoSection (frame, tempo.beats_per_minute(), tempo.note_type(), type); - do_insert (ts); + do_insert (t); if (recompute) { - solve_map (_metrics, ts, Tempo (ts->beats_per_minute(), ts->note_type()), ts->frame()); + solve_map (_metrics, t, t->frame()); + recompute_meters (_metrics); } + + return t; } void @@ -935,18 +993,17 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T { { Glib::Threads::RWLock::WriterLock lm (lock); - MeterSection& first (first_meter()); if (ms.movable()) { remove_meter_locked (ms); add_meter_locked (meter, bbt_to_beats_locked (_metrics, where), where, true); } else { - const PositionLockStyle pl = ms.position_lock_style(); + MeterSection& first (first_meter()); /* cannot move the first meter section */ *static_cast(&first) = meter; - first.set_position_lock_style (pl); - recompute_map (_metrics); + first.set_position_lock_style (AudioTime); } + recompute_map (_metrics); } PropertyChanged (PropertyChange ()); @@ -960,6 +1017,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const frame const double beat = ms.beat(); const BBT_Time bbt = ms.bbt(); + if (ms.movable()) { remove_meter_locked (ms); add_meter_locked (meter, frame, beat, bbt, true); @@ -976,20 +1034,20 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const frame first_t.set_frame (first.frame()); first_t.set_pulse (0.0); first_t.set_position_lock_style (AudioTime); - - recompute_map (_metrics); } + recompute_map (_metrics); } PropertyChanged (PropertyChange ()); } -void +MeterSection* TempoMap::add_meter (const Meter& meter, const double& beat, const BBT_Time& where) { + MeterSection* m = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - add_meter_locked (meter, beat, where, true); + m = add_meter_locked (meter, beat, where, true); } @@ -1000,14 +1058,17 @@ TempoMap::add_meter (const Meter& meter, const double& beat, const BBT_Time& whe #endif PropertyChanged (PropertyChange ()); + + return m; } -void +MeterSection* TempoMap::add_meter (const Meter& meter, const framepos_t& frame, const double& beat, const Timecode::BBT_Time& where) { + MeterSection* m = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - add_meter_locked (meter, frame, beat, where, true); + m = add_meter_locked (meter, frame, beat, where, true); } @@ -1018,10 +1079,12 @@ TempoMap::add_meter (const Meter& meter, const framepos_t& frame, const double& #endif PropertyChanged (PropertyChange ()); + + return m; } -void -TempoMap::add_meter_locked (const Meter& meter, double beat, BBT_Time where, bool recompute) +MeterSection* +TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, bool recompute) { /* a new meter always starts a new bar on the first beat. so round the start time appropriately. remember that @@ -1030,38 +1093,37 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, BBT_Time where, boo */ - if (where.beats != 1) { - where.beats = 1; - where.bars++; - } - /* new meters *always* start on a beat. */ - where.ticks = 0; - double pulse = pulse_at_beat_locked (_metrics, beat); - + const double pulse = pulse_at_beat_locked (_metrics, beat); MeterSection* new_meter = new MeterSection (pulse, beat, where, meter.divisions_per_bar(), meter.note_divisor()); + do_insert (new_meter); if (recompute) { - solve_map (_metrics, new_meter, Meter (meter.divisions_per_bar(), meter.note_divisor()), pulse); + solve_map (_metrics, new_meter, where); } + return new_meter; } -void -TempoMap::add_meter_locked (const Meter& meter, framepos_t frame, double beat, Timecode::BBT_Time where, bool recompute) +MeterSection* +TempoMap::add_meter_locked (const Meter& meter, framepos_t frame, double beat, const Timecode::BBT_Time& where, bool recompute) { + /* add meter-locked tempo */ + TempoSection* t = add_tempo_locked (tempo_at_locked (_metrics, frame), frame, true, TempoSection::Ramp); + if (t) { + t->set_locked_to_meter (true); + } MeterSection* new_meter = new MeterSection (frame, beat, where, meter.divisions_per_bar(), meter.note_divisor()); - - double pulse = pulse_at_frame_locked (_metrics, frame); - new_meter->set_pulse (pulse); + new_meter->set_pulse (pulse_at_frame_locked (_metrics, frame)); do_insert (new_meter); if (recompute) { - solve_map (_metrics, new_meter, Meter (new_meter->divisions_per_bar(), new_meter->note_divisor()), frame); + solve_map (_metrics, new_meter, frame); } + return new_meter; } void @@ -1218,7 +1280,7 @@ TempoMap::first_tempo () void TempoMap::recompute_tempos (Metrics& metrics) { - TempoSection* prev_ts = 0; + TempoSection* prev_t = 0; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { TempoSection* t; @@ -1227,66 +1289,104 @@ TempoMap::recompute_tempos (Metrics& metrics) if (!t->active()) { continue; } - if (prev_ts) { + if (!t->movable()) { + if (!prev_t) { + t->set_pulse (0.0); + prev_t = t; + continue; + } + } + if (prev_t) { if (t->position_lock_style() == AudioTime) { - prev_ts->set_c_func (prev_ts->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); - t->set_pulse (prev_ts->pulse_at_tempo (t->pulses_per_minute(), t->frame(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); + if (!t->locked_to_meter()) { + t->set_pulse (prev_t->pulse_at_tempo (t->pulses_per_minute(), t->frame(), _frame_rate)); + } } else { - prev_ts->set_c_func (prev_ts->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); - t->set_frame (prev_ts->frame_at_tempo (t->pulses_per_minute(), t->pulse(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); + t->set_frame (prev_t->frame_at_tempo (t->pulses_per_minute(), t->pulse(), _frame_rate)); } } - prev_ts = t; + prev_t = t; } } - prev_ts->set_c_func (0.0); + prev_t->set_c_func (0.0); } -/* tempos must be positioned correctly */ +/* tempos must be positioned correctly. + the current approach is to use a meter's bbt time as its base position unit. + this means that a meter's beat may change, but its bbt may not. + an audio-locked meter requires a recomputation of pulse and beat (but not bbt), + while a music-locked meter requires recomputations of frame pulse and beat (but not bbt) +*/ void TempoMap::recompute_meters (Metrics& metrics) { MeterSection* meter = 0; MeterSection* prev_m = 0; - uint32_t accumulated_bars = 0; for (Metrics::const_iterator mi = metrics.begin(); mi != metrics.end(); ++mi) { if ((meter = dynamic_cast (*mi)) != 0) { - if (prev_m) { - double beats_in_m; - if (meter->position_lock_style() == MusicTime) { - beats_in_m = meter->beat() - prev_m->beat(); - } else { - beats_in_m = ((pulse_at_frame_locked (metrics, meter->frame()) - prev_m->pulse()) * prev_m->note_divisor()) - prev_m->beat(); - } - accumulated_bars += (beats_in_m + 1) / prev_m->divisions_per_bar(); - } if (meter->position_lock_style() == AudioTime) { double pulse = 0.0; pair b_bbt; - if (meter->movable()) { - const double beats = ((pulse_at_frame_locked (metrics, meter->frame()) - prev_m->pulse()) * prev_m->note_divisor()) - prev_m->beat(); - const double ceil_beats = beats - fmod (beats, prev_m->divisions_per_bar()); - const double true_pulse = prev_m->pulse() + (ceil_beats - prev_m->beat()) / prev_m->note_divisor(); - const double pulse_off = true_pulse - ((beats - prev_m->beat()) / prev_m->note_divisor()); - b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0)); - pulse = true_pulse - pulse_off; + TempoSection* meter_locked_tempo = 0; + for (Metrics::const_iterator ii = metrics.begin(); ii != metrics.end(); ++ii) { + TempoSection* t; + if ((t = dynamic_cast (*ii)) != 0) { + if ((t->locked_to_meter() || !t->movable()) && t->frame() == meter->frame()) { + meter_locked_tempo = t; + break; + } + } + } + + if (prev_m) { + const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); + if (beats + prev_m->beat() != meter->beat()) { + /* reordering caused a bbt change */ + b_bbt = make_pair (beats + prev_m->beat() + , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0)); + pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); + + } else if (meter->movable()) { + b_bbt = make_pair (meter->beat(), meter->bbt()); + pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); + } } else { b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); } + if (meter_locked_tempo) { + meter_locked_tempo->set_pulse (pulse); + } meter->set_beat (b_bbt); meter->set_pulse (pulse); + } else { + /* MusicTime */ double pulse = 0.0; + pair new_beat; if (prev_m) { - pulse = prev_m->pulse() + (meter->beat() - prev_m->beat()) / prev_m->note_divisor(); + const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); + if (beats + prev_m->beat() != meter->beat()) { + /* reordering caused a bbt change */ + new_beat = make_pair (beats + prev_m->beat() + , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0)); + } else { + new_beat = make_pair (beats + prev_m->beat(), meter->bbt()); + } + pulse = (beats / prev_m->note_divisor()) + prev_m->pulse(); } else { + /* shouldn't happen - the first is audio-locked */ pulse = pulse_at_beat_locked (metrics, meter->beat()); + new_beat = make_pair (meter->beat(), meter->bbt()); } - meter->set_frame (frame_at_pulse_locked (metrics, pulse)); + + meter->set_beat (new_beat); meter->set_pulse (pulse); + meter->set_frame (frame_at_pulse_locked (metrics, pulse)); } prev_m = meter; @@ -1320,63 +1420,6 @@ TempoMap::recompute_map (Metrics& metrics, framepos_t end) recompute_meters (metrics); } -double -TempoMap::pulse_at_beat (const double& beat) const -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - return pulse_at_beat_locked (_metrics, beat); -} - -double -TempoMap::pulse_at_beat_locked (const Metrics& metrics, const double& beat) const -{ - MeterSection* prev_ms = 0; - double accumulated_beats = 0.0; - - for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - MeterSection* m; - if ((m = dynamic_cast (*i)) != 0) { - if (prev_ms && m->beat() > beat) { - break; - } - accumulated_beats = m->beat(); - prev_ms = m; - } - - } - double const ret = prev_ms->pulse() + ((beat - accumulated_beats) / prev_ms->note_divisor()); - return ret; -} - -double -TempoMap::beat_at_pulse (const double& pulse) const -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - return beat_at_pulse_locked (_metrics, pulse); -} - -double -TempoMap::beat_at_pulse_locked (const Metrics& metrics, const double& pulse) const -{ - MeterSection* prev_ms = 0; - double accumulated_beats = 0.0; - - for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - MeterSection* m; - if ((m = dynamic_cast (*i)) != 0) { - if (prev_ms && m->pulse() > pulse) { - break; - } - accumulated_beats = m->beat(); - prev_ms = m; - } - } - - double const beats_in_section = (pulse - prev_ms->pulse()) * prev_ms->note_divisor(); - - return beats_in_section + accumulated_beats; -} - TempoMetric TempoMap::metric_at (framepos_t frame, Metrics::const_iterator* last) const { @@ -1436,165 +1479,261 @@ TempoMap::metric_at (BBT_Time bbt) const return m; } -void -TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt) +double +TempoMap::pulse_at_beat_locked (const Metrics& metrics, const double& beat) const { + MeterSection* prev_m = 0; - if (frame < 0) { - bbt.bars = 1; - bbt.beats = 1; - bbt.ticks = 0; - warning << string_compose (_("tempo map asked for BBT time at frame %1\n"), frame) << endmsg; - return; - } - Glib::Threads::RWLock::ReaderLock lm (lock); - double const beat = beat_at_frame_locked (_metrics, frame); + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* m; + if ((m = dynamic_cast (*i)) != 0) { + if (prev_m && m->beat() > beat) { + break; + } + prev_m = m; + } - bbt = beats_to_bbt_locked (_metrics, beat); + } + double const ret = prev_m->pulse() + ((beat - prev_m->beat()) / prev_m->note_divisor()); + return ret; } double -TempoMap::bbt_to_beats (const Timecode::BBT_Time& bbt) +TempoMap::pulse_at_beat (const double& beat) const { Glib::Threads::RWLock::ReaderLock lm (lock); - - return bbt_to_beats_locked (_metrics, bbt); + return pulse_at_beat_locked (_metrics, beat); } double -TempoMap::bbt_to_beats_locked (const Metrics& metrics, const Timecode::BBT_Time& bbt) const +TempoMap::beat_at_pulse_locked (const Metrics& metrics, const double& pulse) const { - /* CALLER HOLDS READ LOCK */ + MeterSection* prev_m = 0; - double accumulated_beats = 0.0; - double accumulated_bars = 0.0; - MeterSection* prev_ms = 0; - /* because audio-locked meters have 'fake' integral beats, - there is no pulse offset here. - */ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { - double bars_to_m = 0.0; - if (prev_ms) { - bars_to_m = (m->beat() - prev_ms->beat()) / prev_ms->divisions_per_bar(); - if ((bars_to_m + accumulated_bars) > (bbt.bars - 1)) { + if (prev_m && m->pulse() > pulse) { + if (((pulse - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat() > m->beat()) { break; } - accumulated_beats = m->beat(); - accumulated_bars += bars_to_m; } - prev_ms = m; + prev_m = m; } } - double const remaining_bars = (bbt.bars - 1) - accumulated_bars; - double const remaining_bars_in_beats = remaining_bars * prev_ms->divisions_per_bar(); - double const ret = remaining_bars_in_beats + accumulated_beats + (bbt.beats - 1) + (bbt.ticks / BBT_Time::ticks_per_beat); - + double const ret = ((pulse - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat(); return ret; } -Timecode::BBT_Time -TempoMap::beats_to_bbt (const double& beats) +double +TempoMap::beat_at_pulse (const double& pulse) const { Glib::Threads::RWLock::ReaderLock lm (lock); - - return beats_to_bbt_locked (_metrics, beats); + return beat_at_pulse_locked (_metrics, pulse); } -Timecode::BBT_Time -TempoMap::beats_to_bbt_locked (const Metrics& metrics, const double& b) const +/* tempo section based */ +double +TempoMap::pulse_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const { - /* CALLER HOLDS READ LOCK */ - MeterSection* prev_ms = 0; - const double beats = (b < 0.0) ? 0.0 : b; - uint32_t accumulated_bars = 0; - double accumulated_beats = 0.0; + /* HOLD (at least) THE READER LOCK */ + TempoSection* prev_t = 0; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - MeterSection* m = 0; - - if ((m = dynamic_cast (*i)) != 0) { - - if (prev_ms) { - double const beats_to_m = m->beat() - prev_ms->beat(); - if (accumulated_beats + beats_to_m > beats) { - /* this is the meter after the one our beat is on*/ - break; - } - - /* we need a whole number of bars. */ - accumulated_bars += (beats_to_m + 1) / prev_ms->divisions_per_bar(); - accumulated_beats += beats_to_m; + TempoSection* t; + if ((t = dynamic_cast (*i)) != 0) { + if (!t->active()) { + continue; } - - prev_ms = m; + if (prev_t && t->frame() > frame) { + /*the previous ts is the one containing the frame */ + const double ret = prev_t->pulse_at_frame (frame, _frame_rate); + return ret; + } + prev_t = t; } } - double const beats_in_ms = beats - accumulated_beats; - uint32_t const bars_in_ms = (uint32_t) floor (beats_in_ms / prev_ms->divisions_per_bar()); - uint32_t const total_bars = bars_in_ms + accumulated_bars; - double const remaining_beats = beats_in_ms - (bars_in_ms * prev_ms->divisions_per_bar()); - double const remaining_ticks = (remaining_beats - floor (remaining_beats)) * BBT_Time::ticks_per_beat; + /* treated as constant for this ts */ + const double pulses_in_section = (frame - prev_t->frame()) / prev_t->frames_per_pulse (_frame_rate); - BBT_Time ret; + return pulses_in_section + prev_t->pulse(); +} - ret.ticks = (uint32_t) floor (remaining_ticks + 0.5); - ret.beats = (uint32_t) floor (remaining_beats); - ret.bars = total_bars; +double +TempoMap::pulse_at_frame (const framecnt_t& frame) const +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + return pulse_at_frame_locked (_metrics, frame); +} - /* 0 0 0 to 1 1 0 - based mapping*/ - ++ret.bars; - ++ret.beats; +/* tempo section based */ +framecnt_t +TempoMap::frame_at_pulse_locked (const Metrics& metrics, const double& pulse) const +{ + /* HOLD THE READER LOCK */ - if (ret.ticks >= BBT_Time::ticks_per_beat) { - ++ret.beats; - ret.ticks -= BBT_Time::ticks_per_beat; - } + const TempoSection* prev_t = 0; - if (ret.beats >= prev_ms->divisions_per_bar() + 1) { - ++ret.bars; - ret.beats = 1; + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* t; + + if ((t = dynamic_cast (*i)) != 0) { + if (!t->active()) { + continue; + } + if (prev_t && t->pulse() > pulse) { + return prev_t->frame_at_pulse (pulse, _frame_rate); + } + + prev_t = t; + } } + /* must be treated as constant, irrespective of _type */ + double const pulses_in_section = pulse - prev_t->pulse(); + double const dtime = pulses_in_section * prev_t->frames_per_pulse (_frame_rate); + + framecnt_t const ret = (framecnt_t) floor (dtime) + prev_t->frame(); return ret; } -Timecode::BBT_Time -TempoMap::pulse_to_bbt (const double& pulse) +framecnt_t +TempoMap::frame_at_pulse (const double& pulse) const { Glib::Threads::RWLock::ReaderLock lm (lock); - MeterSection* prev_ms = 0; - uint32_t accumulated_bars = 0; - double accumulated_pulses = 0.0; + return frame_at_pulse_locked (_metrics, pulse); +} - for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { - MeterSection* m = 0; +/* meter section based */ +double +TempoMap::beat_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const +{ + const TempoSection& ts = tempo_section_at_locked (metrics, frame); + MeterSection* prev_m = 0; + MeterSection* next_m = 0; + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { + if (prev_m && m->frame() > frame) { + next_m = m; + break; + } + prev_m = m; + } + } + if (frame < prev_m->frame()) { + return 0.0; + } + const double beat = prev_m->beat() + (ts.pulse_at_frame (frame, _frame_rate) - prev_m->pulse()) * prev_m->note_divisor(); - if (prev_ms) { - double const pulses_to_m = m->pulse() - prev_ms->pulse(); - if (accumulated_pulses + pulses_to_m > pulse) { - /* this is the meter after the one our beat is on*/ + if (next_m && next_m->beat() < beat) { + return next_m->beat(); + } + + return beat; +} + +double +TempoMap::beat_at_frame (const framecnt_t& frame) const +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + return beat_at_frame_locked (_metrics, frame); +} + +/* meter section based */ +framecnt_t +TempoMap::frame_at_beat_locked (const Metrics& metrics, const double& beat) const +{ + const TempoSection& prev_t = tempo_section_at_beat_locked (metrics, beat); + MeterSection* prev_m = 0; + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* m; + if ((m = dynamic_cast (*i)) != 0) { + if (prev_m && m->beat() > beat) { + break; + } + prev_m = m; + } + } + + return prev_t.frame_at_pulse (((beat - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse(), _frame_rate); +} + +framecnt_t +TempoMap::frame_at_beat (const double& beat) const +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + return frame_at_beat_locked (_metrics, beat); +} + +double +TempoMap::bbt_to_beats_locked (const Metrics& metrics, const Timecode::BBT_Time& bbt) const +{ + /* CALLER HOLDS READ LOCK */ + + MeterSection* prev_m = 0; + + /* because audio-locked meters have 'fake' integral beats, + there is no pulse offset here. + */ + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* m; + if ((m = dynamic_cast (*i)) != 0) { + if (prev_m) { + const double bars_to_m = (m->beat() - prev_m->beat()) / prev_m->divisions_per_bar(); + if ((bars_to_m + (prev_m->bbt().bars - 1)) > (bbt.bars - 1)) { break; } + } + prev_m = m; + } + } + + const double remaining_bars = bbt.bars - prev_m->bbt().bars; + const double remaining_bars_in_beats = remaining_bars * prev_m->divisions_per_bar(); + const double ret = remaining_bars_in_beats + prev_m->beat() + (bbt.beats - 1) + (bbt.ticks / BBT_Time::ticks_per_beat); - /* we need a whole number of bars. */ - accumulated_pulses += pulses_to_m; - accumulated_bars += ((pulses_to_m * prev_ms->note_divisor()) + 1) / prev_ms->divisions_per_bar(); + return ret; +} + +double +TempoMap::bbt_to_beats (const Timecode::BBT_Time& bbt) +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + return bbt_to_beats_locked (_metrics, bbt); +} + +Timecode::BBT_Time +TempoMap::beats_to_bbt_locked (const Metrics& metrics, const double& b) const +{ + /* CALLER HOLDS READ LOCK */ + MeterSection* prev_m = 0; + const double beats = (b < 0.0) ? 0.0 : b; + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* m = 0; + + if ((m = dynamic_cast (*i)) != 0) { + if (prev_m) { + if (m->beat() > beats) { + /* this is the meter after the one our beat is on*/ + break; + } } - prev_ms = m; + prev_m = m; } } - double const beats_in_ms = (pulse - prev_ms->pulse()) * prev_ms->note_divisor(); - uint32_t const bars_in_ms = (uint32_t) floor (beats_in_ms / prev_ms->divisions_per_bar()); - uint32_t const total_bars = bars_in_ms + accumulated_bars; - double const remaining_beats = beats_in_ms - (bars_in_ms * prev_ms->divisions_per_bar()); - double const remaining_ticks = (remaining_beats - floor (remaining_beats)) * BBT_Time::ticks_per_beat; + + const double beats_in_ms = beats - prev_m->beat(); + const uint32_t bars_in_ms = (uint32_t) floor (beats_in_ms / prev_m->divisions_per_bar()); + const uint32_t total_bars = bars_in_ms + (prev_m->bbt().bars - 1); + const double remaining_beats = beats_in_ms - (bars_in_ms * prev_m->divisions_per_bar()); + const double remaining_ticks = (remaining_beats - floor (remaining_beats)) * BBT_Time::ticks_per_beat; BBT_Time ret; @@ -1602,7 +1741,7 @@ TempoMap::pulse_to_bbt (const double& pulse) ret.beats = (uint32_t) floor (remaining_beats); ret.bars = total_bars; - /* 0 0 0 to 1 1 0 mapping*/ + /* 0 0 0 to 1 1 0 - based mapping*/ ++ret.bars; ++ret.beats; @@ -1611,7 +1750,7 @@ TempoMap::pulse_to_bbt (const double& pulse) ret.ticks -= BBT_Time::ticks_per_beat; } - if (ret.beats >= prev_ms->divisions_per_bar() + 1) { + if (ret.beats >= prev_m->divisions_per_bar() + 1) { ++ret.bars; ret.beats = 1; } @@ -1619,95 +1758,89 @@ TempoMap::pulse_to_bbt (const double& pulse) return ret; } -double -TempoMap::beat_at_frame (const framecnt_t& frame) const +Timecode::BBT_Time +TempoMap::beats_to_bbt (const double& beats) { Glib::Threads::RWLock::ReaderLock lm (lock); - return beat_at_frame_locked (_metrics, frame); + return beats_to_bbt_locked (_metrics, beats); } -double -TempoMap::beat_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const +Timecode::BBT_Time +TempoMap::pulse_to_bbt (const double& pulse) { - //framecnt_t const offset_frame = frame + frame_offset_at (metrics, frame); - double const pulse = pulse_at_frame_locked (metrics, frame); + Glib::Threads::RWLock::ReaderLock lm (lock); + MeterSection* prev_m = 0; - return beat_at_pulse_locked (metrics, pulse); -} + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + MeterSection* m = 0; -double -TempoMap::pulse_at_frame_locked (const Metrics& metrics, const framecnt_t& frame) const -{ - /* HOLD (at least) THE READER LOCK */ - TempoSection* prev_ts = 0; - double accumulated_pulses = 0.0; + if ((m = dynamic_cast (*i)) != 0) { - for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - TempoSection* t; - if ((t = dynamic_cast (*i)) != 0) { - if (!t->active()) { - continue; - } - if (prev_ts && t->frame() > frame) { - /*the previous ts is the one containing the frame */ - double const ret = prev_ts->pulse_at_frame (frame, _frame_rate); - return ret; + if (prev_m) { + double const pulses_to_m = m->pulse() - prev_m->pulse(); + if (prev_m->pulse() + pulses_to_m > pulse) { + /* this is the meter after the one our beat is on*/ + break; + } } - accumulated_pulses = t->pulse(); - prev_ts = t; + + prev_m = m; } } - /* treated as constant for this ts */ - double const pulses_in_section = (frame - prev_ts->frame()) / prev_ts->frames_per_pulse (_frame_rate); + const double beats_in_ms = (pulse - prev_m->pulse()) * prev_m->note_divisor(); + const uint32_t bars_in_ms = (uint32_t) floor (beats_in_ms / prev_m->divisions_per_bar()); + const uint32_t total_bars = bars_in_ms + (prev_m->bbt().bars - 1); + const double remaining_beats = beats_in_ms - (bars_in_ms * prev_m->divisions_per_bar()); + const double remaining_ticks = (remaining_beats - floor (remaining_beats)) * BBT_Time::ticks_per_beat; - return pulses_in_section + accumulated_pulses; -} + BBT_Time ret; -framecnt_t -TempoMap::frame_at_beat (const double& beat) const -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - return frame_at_beat_locked (_metrics, beat); -} + ret.ticks = (uint32_t) floor (remaining_ticks + 0.5); + ret.beats = (uint32_t) floor (remaining_beats); + ret.bars = total_bars; -framecnt_t -TempoMap::frame_at_beat_locked (const Metrics& metrics, const double& beat) const -{ - framecnt_t const frame = frame_at_pulse_locked (metrics, pulse_at_beat_locked (metrics, beat)); - //frameoffset_t const frame_off = frame_offset_at (metrics, frame); - return frame; -} + /* 0 0 0 to 1 1 0 mapping*/ + ++ret.bars; + ++ret.beats; -framecnt_t -TempoMap::frame_at_pulse_locked (const Metrics& metrics, const double& pulse) const -{ - /* HOLD THE READER LOCK */ + if (ret.ticks >= BBT_Time::ticks_per_beat) { + ++ret.beats; + ret.ticks -= BBT_Time::ticks_per_beat; + } - const TempoSection* prev_ts = 0; - double accumulated_pulses = 0.0; + if (ret.beats >= prev_m->divisions_per_bar() + 1) { + ++ret.bars; + ret.beats = 1; + } - for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { - TempoSection* t; + return ret; +} - if ((t = dynamic_cast (*i)) != 0) { - if (!t->active()) { - continue; - } - if (prev_ts && t->pulse() > pulse) { - return prev_ts->frame_at_pulse (pulse, _frame_rate); - } +void +TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt) +{ - accumulated_pulses = t->pulse(); - prev_ts = t; - } + if (frame < 0) { + bbt.bars = 1; + bbt.beats = 1; + bbt.ticks = 0; + warning << string_compose (_("tempo map asked for BBT time at frame %1\n"), frame) << endmsg; + return; } - /* must be treated as constant, irrespective of _type */ - double const pulses_in_section = pulse - accumulated_pulses; - double const dtime = pulses_in_section * prev_ts->frames_per_pulse (_frame_rate); + Glib::Threads::RWLock::ReaderLock lm (lock); + const double beat = beat_at_frame_locked (_metrics, frame); - framecnt_t const ret = (framecnt_t) floor (dtime) + prev_ts->frame(); + bbt = beats_to_bbt_locked (_metrics, beat); +} + +/* meter section based */ +framepos_t +TempoMap::frame_time_locked (const Metrics& metrics, const BBT_Time& bbt) const +{ + /* HOLD THE READER LOCK */ + const framepos_t ret = frame_at_beat_locked (metrics, bbt_to_beats_locked (metrics, bbt)); return ret; } @@ -1723,48 +1856,56 @@ TempoMap::frame_time (const BBT_Time& bbt) throw std::logic_error ("beats are counted from one"); } Glib::Threads::RWLock::ReaderLock lm (lock); - double const beat = bbt_to_beats_locked (_metrics, bbt); - framecnt_t const frame = frame_at_beat_locked (_metrics, beat); - return frame; -} -framepos_t -TempoMap::frame_time_locked (const Metrics& metrics, const BBT_Time& bbt) const -{ - /* HOLD THE READER LOCK */ - - framepos_t const ret = frame_at_pulse_locked (metrics, pulse_at_beat_locked (metrics, bbt_to_beats_locked (metrics, bbt))); - - return ret; + return frame_time_locked (_metrics, bbt); } bool -TempoMap::check_solved (Metrics& metrics, bool by_frame) +TempoMap::check_solved (const Metrics& metrics, bool by_frame) const { - TempoSection* prev_ts = 0; + TempoSection* prev_t = 0; + MeterSection* prev_m = 0; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { TempoSection* t; + MeterSection* m; if ((t = dynamic_cast (*i)) != 0) { if (!t->active()) { continue; } - if (prev_ts) { - if ((by_frame && t->frame() < prev_ts->frame()) || (!by_frame && t->pulse() < prev_ts->pulse())) { + if (prev_t) { + if ((by_frame && t->frame() < prev_t->frame()) || (!by_frame && t->pulse() < prev_t->pulse())) { return false; } - if (t->frame() == prev_ts->frame()) { + if (t->frame() == prev_t->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)) { + /* precision check ensures pulses and frames align.*/ + if (t->frame() != prev_t->frame_at_pulse (t->pulse(), _frame_rate)) { + if (!t->locked_to_meter()) { + return false; + } + } + } + prev_t = t; + } + + if ((m = dynamic_cast (*i)) != 0) { + if (prev_m && m->position_lock_style() == AudioTime) { + TempoSection* t = const_cast(&tempo_section_at_locked (metrics, m->frame() - 1)); + const double nascent_m_pulse = ((m->beat() - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse(); + const framepos_t nascent_m_frame = t->frame_at_pulse (nascent_m_pulse, _frame_rate); + + if (t && (nascent_m_frame > m->frame() || nascent_m_frame < 0)) { return false; } } - prev_ts = t; + + prev_m = m; } + } return true; @@ -1794,9 +1935,9 @@ TempoMap::set_active_tempos (const Metrics& metrics, const framepos_t& frame) } bool -TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm, const framepos_t& frame) +TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const framepos_t& frame) { - TempoSection* prev_ts = 0; + TempoSection* prev_t = 0; TempoSection* section_prev = 0; framepos_t first_m_frame = 0; @@ -1811,9 +1952,9 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm } if (section->movable() && frame <= first_m_frame) { return false; - } else { - section->set_active (true); } + + section->set_active (true); section->set_frame (frame); for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { @@ -1823,26 +1964,30 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm if (!t->active()) { continue; } - if (prev_ts) { + if (prev_t) { if (t == section) { - section_prev = prev_ts; + section_prev = prev_t; continue; } if (t->position_lock_style() == MusicTime) { - prev_ts->set_c_func (prev_ts->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); - t->set_frame (prev_ts->frame_at_pulse (t->pulse(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); + t->set_frame (prev_t->frame_at_pulse (t->pulse(), _frame_rate)); } else { - prev_ts->set_c_func (prev_ts->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); - t->set_pulse (prev_ts->pulse_at_frame (t->frame(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); + if (!t->locked_to_meter()) { + t->set_pulse (prev_t->pulse_at_frame (t->frame(), _frame_rate)); + } } } - prev_ts = t; + prev_t = t; } } if (section_prev) { section_prev->set_c_func (section_prev->compute_c_func_frame (section->pulses_per_minute(), frame, _frame_rate)); - section->set_pulse (section_prev->pulse_at_frame (frame, _frame_rate)); + if (!section->locked_to_meter()) { + section->set_pulse (section_prev->pulse_at_frame (frame, _frame_rate)); + } } if (section->position_lock_style() == MusicTime) { @@ -1855,7 +2000,6 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm } if (check_solved (imaginary, true)) { - recompute_meters (imaginary); return true; } @@ -1869,34 +2013,18 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm } else { recompute_tempos (imaginary); } - if (check_solved (imaginary, true)) { - recompute_meters (imaginary); - return true; - } - MetricSectionSorter cmp; - imaginary.sort (cmp); - if (section->position_lock_style() == MusicTime) { - /* we're setting the frame */ - section->set_position_lock_style (AudioTime); - recompute_tempos (imaginary); - section->set_position_lock_style (MusicTime); - } else { - recompute_tempos (imaginary); - } if (check_solved (imaginary, true)) { - recompute_meters (imaginary); return true; } - //dump (imaginary, std::cerr); return false; } bool -TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm, const double& pulse) +TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const double& pulse) { - TempoSection* prev_ts = 0; + TempoSection* prev_t = 0; TempoSection* section_prev = 0; section->set_pulse (pulse); @@ -1907,20 +2035,27 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm if (!t->active()) { continue; } - if (prev_ts) { + if (!t->movable()) { + t->set_pulse (0.0); + prev_t = t; + continue; + } + if (prev_t) { if (t == section) { - section_prev = prev_ts; + section_prev = prev_t; continue; } if (t->position_lock_style() == MusicTime) { - prev_ts->set_c_func (prev_ts->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); - t->set_frame (prev_ts->frame_at_pulse (t->pulse(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_pulse (t->pulses_per_minute(), t->pulse(), _frame_rate)); + t->set_frame (prev_t->frame_at_pulse (t->pulse(), _frame_rate)); } else { - prev_ts->set_c_func (prev_ts->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); - t->set_pulse (prev_ts->pulse_at_frame (t->frame(), _frame_rate)); + prev_t->set_c_func (prev_t->compute_c_func_frame (t->pulses_per_minute(), t->frame(), _frame_rate)); + if (!t->locked_to_meter()) { + t->set_pulse (prev_t->pulse_at_frame (t->frame(), _frame_rate)); + } } } - prev_ts = t; + prev_t = t; } } if (section_prev) { @@ -1936,8 +2071,8 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm } else { recompute_tempos (imaginary); } + if (check_solved (imaginary, false)) { - recompute_meters (imaginary); return true; } @@ -1953,127 +2088,160 @@ TempoMap::solve_map (Metrics& imaginary, TempoSection* section, const Tempo& bpm } if (check_solved (imaginary, false)) { - recompute_meters (imaginary); - return true; - } - - MetricSectionFrameSorter fcmp; - imaginary.sort (fcmp); - if (section->position_lock_style() == AudioTime) { - /* we're setting the pulse */ - section->set_position_lock_style (MusicTime); - recompute_tempos (imaginary); - section->set_position_lock_style (AudioTime); - } else { - recompute_tempos (imaginary); - } - - if (check_solved (imaginary, false)) { - recompute_meters (imaginary); return true; } - //dump (imaginary, std::cerr); - return false; } -void -TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt, const framepos_t& frame) +bool +TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const framepos_t& frame) { - MeterSection* prev_ms = 0; + /* disallow moving first meter past any subsequent one, and any movable meter before the first one */ + const MeterSection* other = &meter_section_at_locked (imaginary, frame); + if ((!section->movable() && other->movable()) || (!other->movable() && section->movable() && other->frame() >= frame)) { + return false; + } if (!section->movable()) { /* lock the first tempo to our first meter */ if (!set_active_tempos (imaginary, frame)) { - return; + return false; } - TempoSection* first_t = &first_tempo(); - Metrics future_map; - TempoSection* new_section = copy_metrics_and_point (future_map, first_t); - - new_section->set_frame (frame); - new_section->set_pulse (0.0); - new_section->set_active (true); + } - if (solve_map (future_map, new_section, Tempo (new_section->beats_per_minute(), new_section->note_type()), frame)) { - first_t->set_frame (frame); - first_t->set_pulse (0.0); - first_t->set_active (true); - solve_map (imaginary, first_t, Tempo (first_t->beats_per_minute(), first_t->note_type()), frame); - } else { - return; + /* it would make sense to bail out if there is no audio-locked meter, + however it may be desirable to move a music-locked meter by frame at some point. + */ + TempoSection* meter_locked_tempo = 0; + for (Metrics::const_iterator ii = imaginary.begin(); ii != imaginary.end(); ++ii) { + TempoSection* t; + if ((t = dynamic_cast (*ii)) != 0) { + if ((t->locked_to_meter() || !t->movable()) && t->frame() == section->frame()) { + meter_locked_tempo = t; + break; + } } } - uint32_t accumulated_bars = 0; - - section->set_frame (frame); + MeterSection* prev_m = 0; for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { - if (prev_ms) { - double beats_in_m; - if (m->position_lock_style() == MusicTime) { - beats_in_m = m->beat() - prev_ms->beat(); - } else { - beats_in_m = ((pulse_at_frame_locked (imaginary, frame) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - } - accumulated_bars += (beats_in_m + 1) / prev_ms->divisions_per_bar(); - } if (m == section){ - /* - here we set the beat for this frame. - we set it 'incorrectly' to the next bar's beat - and use this difference to find the meter's pulse. - */ - double pulse = 0.0; - pair b_bbt; - if (m->movable()) { - const double beats = ((pulse_at_frame_locked (imaginary, frame) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - const double ceil_beats = beats - fmod (beats, prev_ms->divisions_per_bar()); - const int32_t bars = (ceil_beats + 1) / prev_ms->divisions_per_bar(); - - b_bbt = make_pair (ceil_beats, BBT_Time (bars + 1, 1, 0)); - const double true_pulse = prev_ms->pulse() + ((ceil_beats - prev_ms->beat()) / prev_ms->note_divisor()); - const double pulse_off = true_pulse - ((beats - prev_ms->beat()) / prev_ms->note_divisor()); - pulse = true_pulse - pulse_off; - } else { - b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); - } - m->set_beat (b_bbt); - m->set_pulse (pulse); - prev_ms = m; - continue; - } - if (prev_ms) { - if (m->position_lock_style() == MusicTime) { - const double pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor(); - m->set_frame (frame_at_pulse_locked (imaginary, pulse)); - m->set_pulse (pulse); + if (prev_m && section->movable()) { + const double beats = (pulse_at_frame_locked (imaginary, frame) - prev_m->pulse()) * prev_m->note_divisor(); + if (beats + prev_m->beat() < section->beat()) { + /* disallow position change if it will alter our beat + we allow tempo changes to do this in recompute_meters(). + blocking this is an option, but i'm not convinced that + this is what the user would actually want. + here we set the frame/pulse corresponding to its musical position. + */ + + if (meter_locked_tempo) { + Metrics future_map; + bool solved = false; + TempoSection* tempo_copy = copy_metrics_and_point (imaginary, future_map, meter_locked_tempo); + const double new_pulse = ((section->beat() - prev_m->beat()) + / prev_m->note_divisor()) + prev_m->pulse(); + const framepos_t smallest_frame = frame_at_pulse_locked (future_map, new_pulse); + if ((solved = solve_map (future_map, tempo_copy, smallest_frame))) { + meter_locked_tempo->set_pulse (new_pulse); + solve_map (imaginary, meter_locked_tempo, smallest_frame); + section->set_frame (smallest_frame); + section->set_pulse (new_pulse); + } else { + solved = false; + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + if (!solved) { + return false; + } + } + return false; + } else { + if (meter_locked_tempo) { + Metrics future_map; + bool solved = false; + + TempoSection* tempo_copy = copy_metrics_and_point (imaginary, future_map, meter_locked_tempo); + MeterSection* meter_copy = const_cast (&meter_section_at_locked (future_map, section->frame())); + meter_copy->set_frame (frame); + + if ((solved = solve_map (future_map, tempo_copy, frame))) { + section->set_frame (frame); + meter_locked_tempo->set_pulse (((section->beat() - prev_m->beat()) + / prev_m->note_divisor()) + prev_m->pulse()); + solve_map (imaginary, meter_locked_tempo, frame); + } else { + solved = false; + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + if (!solved) { + return false; + } + } + } } else { - double pulse = 0.0; - pair b_bbt; - if (m->movable()) { - const double beats = ((pulse_at_frame_locked (imaginary, m->frame()) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - const double ceil_beats = beats - fmod (beats , prev_ms->divisions_per_bar()); - const double true_pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor(); - const double pulse_off = true_pulse - ((ceil_beats - prev_ms->beat()) / prev_ms->note_divisor()); - b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0)); - pulse = true_pulse - pulse_off; + /* not movable (first meter atm) */ + if (meter_locked_tempo) { + Metrics future_map; + bool solved = false; + TempoSection* tempo_copy = copy_metrics_and_point (imaginary, future_map, meter_locked_tempo); + + tempo_copy->set_frame (frame); + tempo_copy->set_pulse (0.0); + + if ((solved = solve_map (future_map, tempo_copy, frame))) { + section->set_frame (frame); + meter_locked_tempo->set_frame (frame); + meter_locked_tempo->set_pulse (0.0); + solve_map (imaginary, meter_locked_tempo, frame); + } else { + solved = false; + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + if (!solved) { + return false; + } + } else { - b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); - pulse = 0.0; + return false; } - m->set_beat (b_bbt); - m->set_pulse (pulse); + pair b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); + section->set_beat (b_bbt); + section->set_pulse (0.0); + } + break; } - prev_ms = m; + + prev_m = m; } } + MetricSectionFrameSorter fcmp; + imaginary.sort (fcmp); if (section->position_lock_style() == MusicTime) { /* we're setting the frame */ section->set_position_lock_style (AudioTime); @@ -2082,66 +2250,114 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt, } else { recompute_meters (imaginary); } - //dump (imaginary, std::cerr); + + return true; } -void -TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt, const double& pulse) +bool +TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const BBT_Time& when) { - MeterSection* prev_ms = 0; - double accumulated_beats = 0.0; - uint32_t accumulated_bars = 0; + /* disallow setting section to an existing meter's bbt */ + for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { + MeterSection* m; + if ((m = dynamic_cast (*i)) != 0) { + if (m != section && m->bbt().bars == when.bars) { + return false; + } + } + } - section->set_pulse (pulse); + MeterSection* prev_m = 0; + MeterSection* section_prev = 0; for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { - if (prev_ms) { - double beats_in_m; - if (m->position_lock_style() == MusicTime) { - beats_in_m = m->beat() - prev_ms->beat(); - } else { - beats_in_m = ((pulse_at_frame_locked (imaginary, m->frame()) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - } - accumulated_beats += beats_in_m; - accumulated_bars += (beats_in_m + 1) / prev_ms->divisions_per_bar(); - } - if (m == section){ - section->set_frame (frame_at_pulse_locked (imaginary, pulse)); - const double beats = ((pulse - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - const int32_t bars = (beats + 1) / prev_ms->divisions_per_bar(); - pair b_bbt = make_pair (beats, BBT_Time (bars + 1, 1, 0)); + pair b_bbt; + double new_pulse = 0.0; + + if (prev_m && m->bbt().bars > when.bars && !section_prev){ + section_prev = prev_m; + const double beats = (when.bars - section_prev->bbt().bars) * section_prev->divisions_per_bar(); + const double pulse = (beats / section_prev->note_divisor()) + section_prev->pulse(); + pair b_bbt = make_pair (beats + section_prev->beat(), when); + section->set_beat (b_bbt); - prev_ms = section; + section->set_pulse (pulse); + section->set_frame (frame_at_pulse_locked (imaginary, pulse)); + prev_m = section; continue; } - if (prev_ms) { - if (m->position_lock_style() == MusicTime) { - const double pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor(); - m->set_frame (frame_at_pulse_locked (imaginary, pulse)); - m->set_pulse (pulse); - } else { - double pulse = 0.0; - pair b_bbt; - if (m->movable()) { - const double beats = ((pulse_at_frame_locked (imaginary, m->frame()) - prev_ms->pulse()) * prev_ms->note_divisor()) - prev_ms->beat(); - const double ceil_beats = beats - fmod (beats, prev_ms->divisions_per_bar()); - const double true_pulse = prev_ms->pulse() + (m->beat() - prev_ms->beat()) / prev_ms->note_divisor(); - const double pulse_off = true_pulse - ((ceil_beats - prev_ms->beat()) / prev_ms->note_divisor()); - b_bbt = make_pair (ceil_beats, BBT_Time (accumulated_bars + 1, 1, 0)); - pulse = true_pulse - pulse_off; - } else { - b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); + + if (m->position_lock_style() == AudioTime) { + TempoSection* meter_locked_tempo = 0; + for (Metrics::const_iterator ii = imaginary.begin(); ii != imaginary.end(); ++ii) { + TempoSection* t; + if ((t = dynamic_cast (*ii)) != 0) { + if ((t->locked_to_meter() || !t->movable()) && t->frame() == m->frame()) { + meter_locked_tempo = t; + break; + } + } + } + + if (prev_m) { + const double beats = ((m->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar()); + + if (beats + prev_m->beat() != m->beat()) { + /* tempo/ meter change caused a change in beat (bar). */ + b_bbt = make_pair (beats + prev_m->beat() + , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0)); + new_pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); + } else if (m->movable()) { + b_bbt = make_pair (m->beat(), m->bbt()); + new_pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); } - m->set_beat (b_bbt); - m->set_pulse (pulse); + } else { + b_bbt = make_pair (0.0, BBT_Time (1, 1, 0)); + } + if (meter_locked_tempo) { + meter_locked_tempo->set_pulse (new_pulse); + recompute_tempos (imaginary); + } + m->set_beat (b_bbt); + m->set_pulse (new_pulse); + + } else { + /* MusicTime */ + const double beats = ((m->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar()); + if (beats + prev_m->beat() != m->beat()) { + /* tempo/ meter change caused a change in beat (bar). */ + b_bbt = make_pair (beats + prev_m->beat() + , BBT_Time ((beats / prev_m->divisions_per_bar()) + prev_m->bbt().bars, 1, 0)); + } else { + b_bbt = make_pair (beats + prev_m->beat() + , m->bbt()); } + new_pulse = (beats / prev_m->note_divisor()) + prev_m->pulse(); + m->set_beat (b_bbt); + m->set_pulse (new_pulse); + m->set_frame (frame_at_pulse_locked (imaginary, new_pulse)); } - prev_ms = m; + + prev_m = m; } } + if (!section_prev) { + + const double beats = (when.bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); + const double pulse = (beats / prev_m->note_divisor()) + prev_m->pulse(); + pair b_bbt = make_pair (beats + prev_m->beat(), when); + + section->set_beat (b_bbt); + section->set_pulse (pulse); + section->set_frame (frame_at_pulse_locked (imaginary, pulse)); + } + + MetricSectionSorter cmp; + imaginary.sort (cmp); + if (section->position_lock_style() == AudioTime) { /* we're setting the pulse */ section->set_position_lock_style (MusicTime); @@ -2150,71 +2366,83 @@ TempoMap::solve_map (Metrics& imaginary, MeterSection* section, const Meter& mt, } else { recompute_meters (imaginary); } + + return true; } /** places a copy of _metrics into copy and returns a pointer - * to section's equivalent. + * to section's equivalent in copy. */ TempoSection* -TempoMap::copy_metrics_and_point (Metrics& copy, TempoSection* section) +TempoMap::copy_metrics_and_point (const Metrics& metrics, Metrics& copy, TempoSection* section) { - TempoSection* t; TempoSection* ret = 0; - MeterSection* m; - for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* t; + MeterSection* m; if ((t = dynamic_cast (*i)) != 0) { if (t == section) { - if (t->position_lock_style() == MusicTime) { - ret = new TempoSection (t->pulse(), t->beats_per_minute(), t->note_type(), t->type()); - } else { - ret = new TempoSection (t->frame(), t->beats_per_minute(), t->note_type(), t->type()); - } - ret->set_active (t->active()); - ret->set_movable (t->movable()); + ret = new TempoSection (*t); copy.push_back (ret); continue; } - TempoSection* cp = 0; - if (t->position_lock_style() == MusicTime) { - cp = new TempoSection (t->pulse(), t->beats_per_minute(), t->note_type(), t->type()); - } else { - cp = new TempoSection (t->frame(), t->beats_per_minute(), t->note_type(), t->type()); - } - cp->set_active (t->active()); - cp->set_movable (t->movable()); + + TempoSection* cp = new TempoSection (*t); copy.push_back (cp); } if ((m = dynamic_cast (*i)) != 0) { - MeterSection* cp = 0; - if (m->position_lock_style() == MusicTime) { - cp = new MeterSection (m->pulse(), m->beat(), m->bbt(), m->divisions_per_bar(), m->note_divisor()); - cp->set_frame (m->frame()); - } else { - cp = new MeterSection (m->frame(), m->beat(), m->bbt(), m->divisions_per_bar(), m->note_divisor()); - cp->set_pulse (m->pulse()); + MeterSection* cp = new MeterSection (*m); + copy.push_back (cp); + } + } + + return ret; +} + +MeterSection* +TempoMap::copy_metrics_and_point (const Metrics& metrics, Metrics& copy, MeterSection* section) +{ + MeterSection* ret = 0; + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* t; + MeterSection* m; + if ((t = dynamic_cast (*i)) != 0) { + TempoSection* cp = new TempoSection (*t); + copy.push_back (cp); + } + + if ((m = dynamic_cast (*i)) != 0) { + if (m == section) { + ret = new MeterSection (*m); + copy.push_back (ret); + continue; } - cp->set_movable (m->movable()); + MeterSection* cp = new MeterSection (*m); copy.push_back (cp); } } - //recompute_map (copy); + return ret; } bool -TempoMap::can_solve_bbt (TempoSection* ts, const Tempo& bpm, const BBT_Time& bbt) +TempoMap::can_solve_bbt (TempoSection* ts, const BBT_Time& bbt) { Metrics copy; - TempoSection* new_section = 0; + TempoSection* tempo_copy = 0; { Glib::Threads::RWLock::ReaderLock lm (lock); - new_section = copy_metrics_and_point (copy, ts); + tempo_copy = copy_metrics_and_point (_metrics, copy, ts); + if (!tempo_copy) { + return false; + } } - double const beat = bbt_to_beats_locked (copy, bbt); - bool ret = solve_map (copy, new_section, bpm, pulse_at_beat_locked (copy, beat)); + const double beat = bbt_to_beats_locked (copy, bbt); + const bool ret = solve_map (copy, tempo_copy, pulse_at_beat_locked (copy, beat)); Metrics::const_iterator d = copy.begin(); while (d != copy.end()) { @@ -2234,59 +2462,314 @@ TempoMap::can_solve_bbt (TempoSection* ts, const Tempo& bpm, const BBT_Time& bb * @return returns - the position in frames where the new tempo section will lie. */ framepos_t -TempoMap::predict_tempo_frame (TempoSection* section, const Tempo& bpm, const BBT_Time& bbt) +TempoMap::predict_tempo_frame (TempoSection* section, const BBT_Time& bbt) { Glib::Threads::RWLock::ReaderLock lm (lock); Metrics future_map; framepos_t ret = 0; - TempoSection* new_section = copy_metrics_and_point (future_map, section); + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, section); + if (!tempo_copy) { + return 0; + } + const double beat = bbt_to_beats_locked (future_map, bbt); + + if (solve_map (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { + ret = tempo_copy->frame(); + } else { + ret = section->frame(); + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + return ret; +} + +double +TempoMap::predict_tempo_pulse (TempoSection* section, const framepos_t& frame) +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + Metrics future_map; + double ret = 0.0; + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, section); + + if (solve_map (future_map, tempo_copy, frame)) { + ret = tempo_copy->pulse(); + } else { + ret = section->pulse(); + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + return ret; +} + +void +TempoMap::gui_move_tempo_frame (TempoSection* ts, const framepos_t& frame) +{ + Metrics future_map; + { + Glib::Threads::RWLock::WriterLock lm (lock); + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); + if (solve_map (future_map, tempo_copy, frame)) { + solve_map (_metrics, ts, frame); + recompute_meters (_metrics); + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + MetricPositionChanged (); // Emit Signal +} + +void +TempoMap::gui_move_tempo_beat (TempoSection* ts, const double& beat) +{ + Metrics future_map; + { + Glib::Threads::RWLock::WriterLock lm (lock); + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); + if (solve_map (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { + solve_map (_metrics, ts, pulse_at_beat_locked (_metrics, beat)); + recompute_meters (_metrics); + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + MetricPositionChanged (); // Emit Signal +} + +void +TempoMap::gui_move_tempo_pulse (TempoSection* ts, const double& pulse) +{ + Metrics future_map; + { + Glib::Threads::RWLock::WriterLock lm (lock); + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); + if (solve_map (future_map, tempo_copy, pulse)) { + solve_map (_metrics, ts, pulse); + recompute_meters (_metrics); + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + MetricPositionChanged (); // Emit Signal +} + +void +TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) +{ + Metrics future_map; + { + Glib::Threads::RWLock::WriterLock lm (lock); + MeterSection* copy = copy_metrics_and_point (_metrics, future_map, ms); + if (solve_map (future_map, copy, frame)) { + solve_map (_metrics, ms, frame); + recompute_tempos (_metrics); + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + MetricPositionChanged (); // Emit Signal +} + +void +TempoMap::gui_move_meter (MeterSection* ms, const Timecode::BBT_Time& bbt) +{ + Metrics future_map; + { + Glib::Threads::RWLock::WriterLock lm (lock); + MeterSection* copy = copy_metrics_and_point (_metrics, future_map, ms); + if (solve_map (future_map, copy, bbt)) { + solve_map (_metrics, ms, bbt); + recompute_tempos (_metrics); + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + + MetricPositionChanged (); // Emit Signal +} + +bool +TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) +{ + Metrics future_map; + bool can_solve = false; + { + Glib::Threads::RWLock::WriterLock lm (lock); + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); + tempo_copy->set_beats_per_minute (bpm.beats_per_minute()); + recompute_tempos (future_map); + + if (check_solved (future_map, true)) { + ts->set_beats_per_minute (bpm.beats_per_minute()); + recompute_map (_metrics); + can_solve = true; + } + } + + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + if (can_solve) { + MetricPositionChanged (); // Emit Signal + } + return can_solve; +} + +void +TempoMap::gui_dilate_tempo (MeterSection* ms, const framepos_t& frame) +{ + Metrics future_map; + TempoSection* ts = 0; + + if (frame <= first_meter().frame()) { + return; + } + + if (ms->position_lock_style() == AudioTime) { + /* disabled for now due to faked tempo locked to meter pulse */ + return; + } + + { + Glib::Threads::RWLock::WriterLock lm (lock); + ts = const_cast(&tempo_section_at_locked (_metrics, ms->frame() - 1)); + if (!ts) { + return; + } + TempoSection* prev_t = copy_metrics_and_point (_metrics, future_map, ts); + TempoSection* prev_to_prev_t = 0; + const frameoffset_t fr_off = frame - ms->frame(); + double new_bpm = 0.0; + + if (prev_t && prev_t->pulse() > 0.0) { + prev_to_prev_t = const_cast(&tempo_section_at_locked (future_map, prev_t->frame() - 1)); + } + + /* the change in frames is the result of changing the slope of at most 2 previous tempo sections. + constant to constant is straightforward, as the tempo prev to prev_t has constant slope. + */ + double contribution = 0.0; + frameoffset_t frame_contribution = 0; + frameoffset_t prev_t_frame_contribution = fr_off; + + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + /* prev to prev_t's position will remain constant in terms of frame and pulse. lets use frames. */ + contribution = (prev_t->frame() - prev_to_prev_t->frame()) / (double) (ms->frame() - prev_to_prev_t->frame()); + frame_contribution = contribution * (double) fr_off; + prev_t_frame_contribution = fr_off - frame_contribution; + } + + if (prev_t->type() == TempoSection::Constant || prev_t->c_func() == 0.0) { + + if (prev_t->position_lock_style() == MusicTime) { + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->beats_per_minute() * ((ms->frame() - prev_t->frame()) + / (double) (ms->frame() + prev_t_frame_contribution - prev_t->frame())); + + } else { + /* prev to prev is irrelevant */ + const double meter_pulse = prev_t->pulse_at_frame (ms->frame(), _frame_rate); + const double frame_pulse = prev_t->pulse_at_frame (frame, _frame_rate); + + if (frame_pulse != prev_t->pulse()) { + new_bpm = prev_t->beats_per_minute() * ((meter_pulse - prev_t->pulse()) / (frame_pulse - prev_t->pulse())); + } else { + new_bpm = prev_t->beats_per_minute(); + } + } + } else { + /* AudioTime */ + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->beats_per_minute() * ((ms->frame() - prev_t->frame()) + / (double) (ms->frame() + prev_t_frame_contribution - prev_t->frame())); + } else { + /* prev_to_prev_t is irrelevant */ + + if (frame != prev_t->frame()) { + new_bpm = prev_t->beats_per_minute() * ((ms->frame() - prev_t->frame()) / (double) (frame - prev_t->frame())); + } else { + new_bpm = prev_t->beats_per_minute(); + } + } + } + } else if (prev_t->c_func() < 0.0) { + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->tempo_at_frame (prev_t->frame() + frame_contribution, _frame_rate) * (double) prev_t->note_type(); + } else { + /* prev_to_prev_t is irrelevant */ + new_bpm = prev_t->tempo_at_frame (prev_t->frame() + fr_off, _frame_rate) * (double) prev_t->note_type(); + } + + const double diff = (prev_t->tempo_at_frame (frame, _frame_rate) * prev_t->note_type()) - prev_t->beats_per_minute(); + if (diff > -0.1 && diff < 0.1) { + new_bpm = prev_t->beats_per_minute() * ((ms->frame() - prev_t->frame()) + / (double) ((ms->frame() + prev_t_frame_contribution) - prev_t->frame())); + } + + } else if (prev_t->c_func() > 0.0) { + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->tempo_at_frame (prev_t->frame() - frame_contribution, _frame_rate) * (double) prev_t->note_type(); + } else { + /* prev_to_prev_t is irrelevant */ + new_bpm = prev_t->tempo_at_frame (prev_t->frame() - fr_off, _frame_rate) * (double) prev_t->note_type(); + } - double const beat = bbt_to_beats_locked (future_map, bbt); - if (solve_map (future_map, new_section, bpm, pulse_at_beat_locked (future_map, beat))) { - ret = new_section->frame(); - } else { - ret = frame_at_beat_locked (_metrics, beat); - } + /* limits - a bit clunky, but meh */ + const double diff = (prev_t->tempo_at_frame (frame, _frame_rate) * prev_t->note_type()) - prev_t->beats_per_minute(); + if (diff > -0.1 && diff < 0.1) { + new_bpm = prev_t->beats_per_minute() * ((ms->frame() - prev_t->frame()) + / (double) ((ms->frame() + prev_t_frame_contribution) - prev_t->frame())); + } + } - Metrics::const_iterator d = future_map.begin(); - while (d != future_map.end()) { - delete (*d); - ++d; - } - return ret; -} + prev_t->set_beats_per_minute (new_bpm); + recompute_tempos (future_map); + recompute_meters (future_map); -double -TempoMap::predict_tempo_pulse (TempoSection* section, const Tempo& bpm, const framepos_t& frame) -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - Metrics future_map; - double ret = 0.0; - TempoSection* new_section = copy_metrics_and_point (future_map, section); + if (check_solved (future_map, true)) { - if (solve_map (future_map, new_section, bpm, frame)) { - ret = new_section->pulse(); - } else { - ret = pulse_at_frame_locked (_metrics, frame); - } + prev_t = const_cast(&tempo_section_at_locked (_metrics, ms->frame() - 1)); + prev_t->set_beats_per_minute (new_bpm); + recompute_tempos (_metrics); - Metrics::const_iterator d = future_map.begin(); - while (d != future_map.end()) { - delete (*d); - ++d; - } - return ret; -} + if (ms->position_lock_style() == AudioTime) { + ms->set_frame (frame); + } -void -TempoMap::gui_move_tempo_frame (TempoSection* ts, const Tempo& bpm, const framepos_t& frame) -{ - Metrics future_map; - { - Glib::Threads::RWLock::WriterLock lm (lock); - TempoSection* new_section = copy_metrics_and_point (future_map, ts); - if (solve_map (future_map, new_section, bpm, frame)) { - solve_map (_metrics, ts, bpm, frame); + recompute_meters (_metrics); } } @@ -2300,63 +2783,118 @@ TempoMap::gui_move_tempo_frame (TempoSection* ts, const Tempo& bpm, const frame } void -TempoMap::gui_move_tempo_beat (TempoSection* ts, const Tempo& bpm, const double& beat) +TempoMap::gui_dilate_tempo (const framepos_t& frame, const framepos_t& end_frame) { Metrics future_map; + TempoSection* ts = 0; + + { Glib::Threads::RWLock::WriterLock lm (lock); - TempoSection* new_section = copy_metrics_and_point (future_map, ts); - if (solve_map (future_map, new_section, bpm, pulse_at_beat_locked (future_map, beat))) { - solve_map (_metrics, ts, bpm, pulse_at_beat_locked (_metrics, beat)); + ts = const_cast(&tempo_section_at_locked (_metrics, frame - 1)); + if (!ts) { + return; } - } + TempoSection* prev_t = copy_metrics_and_point (_metrics, future_map, ts); + TempoSection* prev_to_prev_t = 0; + const frameoffset_t fr_off = end_frame - frame; - Metrics::const_iterator d = future_map.begin(); - while (d != future_map.end()) { - delete (*d); - ++d; - } + if (prev_t && prev_t->pulse() > 0.0) { + prev_to_prev_t = const_cast(&tempo_section_at_locked (future_map, prev_t->frame() - 1)); + } - MetricPositionChanged (); // Emit Signal -} + /* the change in frames is the result of changing the slope of at most 2 previous tempo sections. + constant to constant is straightforward, as the tempo prev to prev_t has constant slope. + */ + double contribution = 0.0; -void -TempoMap::gui_move_meter (MeterSection* ms, const Meter& mt, const framepos_t& frame) -{ - { - Glib::Threads::RWLock::WriterLock lm (lock); - solve_map (_metrics, ms, mt, frame); - } + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + /* prev to prev_t's position will remain constant in terms of frame and pulse. lets use frames. */ + contribution = prev_to_prev_t->beats_per_minute() / (prev_to_prev_t->beats_per_minute() + prev_t->beats_per_minute()); + } - MetricPositionChanged (); // Emit Signal -} + frameoffset_t frame_contribution = contribution * (double) fr_off; + frameoffset_t prev_t_frame_contribution = fr_off - frame_contribution; -void -TempoMap::gui_move_meter (MeterSection* ms, const Meter& mt, const double& beat) -{ - { - Glib::Threads::RWLock::WriterLock lm (lock); - solve_map (_metrics, ms, mt, pulse_at_beat_locked (_metrics, beat)); - } + const double start_tempo = prev_t->tempo_at_frame (frame, _frame_rate); + const double end_tempo = prev_t->tempo_at_frame (frame + prev_t_frame_contribution, _frame_rate); + const double start_pulse = prev_t->pulse_at_frame (frame, _frame_rate); + const double end_pulse = prev_t->pulse_at_frame (end_frame, _frame_rate); + const double dpulse = (start_pulse) / (end_pulse); + double new_bpm = prev_t->tempo_at_frame (prev_t->frame() - prev_t_frame_contribution, _frame_rate) * (double) prev_t->note_type(); - MetricPositionChanged (); // Emit Signal -} + if (prev_t->type() == TempoSection::Constant || prev_t->c_func() == 0.0) { -bool -TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) -{ - Metrics future_map; - bool can_solve = false; - { - Glib::Threads::RWLock::WriterLock lm (lock); - TempoSection* new_section = copy_metrics_and_point (future_map, ts); - new_section->set_beats_per_minute (bpm.beats_per_minute()); + if (prev_t->position_lock_style() == MusicTime) { + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->beats_per_minute() * ((frame - prev_t->frame()) + / (double) ((frame + prev_t_frame_contribution) - prev_t->frame())); + + } else { + /* prev to prev is irrelevant */ + + if (start_pulse != prev_t->pulse()) { + new_bpm = prev_t->beats_per_minute() * ((start_pulse - prev_t->pulse()) / (end_pulse - prev_t->pulse())); + } else { + new_bpm = prev_t->beats_per_minute(); + } + } + } else { + /* AudioTime */ + if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + new_bpm = prev_t->beats_per_minute() * ((frame - prev_t->frame()) + / (double) ((frame + prev_t_frame_contribution) - prev_t->frame())); + } else { + /* prev_to_prev_t is irrelevant */ + + if (end_frame != prev_t->frame()) { + new_bpm = prev_t->beats_per_minute() * ((frame - prev_t->frame()) / (double) (end_frame - prev_t->frame())); + } else { + new_bpm = prev_t->beats_per_minute(); + } + } + } + } else if (prev_t->c_func() < 0.0) { + + const double end_minute = (((frame + prev_t_frame_contribution) - prev_t->frame()) / (double) _frame_rate) / 60.0; + const double future_c = log (end_tempo / (new_bpm / (double) prev_t->note_type())) / end_minute; + + const double dtempo = (start_tempo) / (end_tempo); + const double dframe = (frame) / (double) ((frame + prev_t_frame_contribution)); + + /* limits - a bit clunky, but meh */ + if (future_c > -10.1 && future_c < 10.1) { + new_bpm = prev_t->beats_per_minute() * (dpulse / dtempo); + } else { + new_bpm = prev_t->beats_per_minute() * (dframe / dtempo); + } + + } else if (prev_t->c_func() > 0.0) { + + const double end_minute = (((frame + prev_t_frame_contribution) - prev_t->frame()) / (double) _frame_rate) / 60.0; + const double future_c = log (end_tempo / (new_bpm / (double) prev_t->note_type())) / end_minute; + + const double dtempo = (end_tempo) / (start_tempo); + const double dframe = (frame) / (double) ((frame + prev_t_frame_contribution)); + + /* limits - a bit clunky, but meh */ + if (future_c > -10.1 && future_c < 10.1) { + new_bpm = prev_t->beats_per_minute() * (dpulse / dtempo); + } else { + new_bpm = prev_t->beats_per_minute() * (dframe / dtempo); + } + } + + prev_t->set_beats_per_minute (new_bpm); recompute_tempos (future_map); + recompute_meters (future_map); if (check_solved (future_map, true)) { - ts->set_beats_per_minute (bpm.beats_per_minute()); - recompute_map (_metrics); - can_solve = true; + + prev_t = const_cast(&tempo_section_at_locked (_metrics, frame - 1)); + prev_t->set_beats_per_minute (new_bpm); + recompute_tempos (_metrics); + recompute_meters (_metrics); } } @@ -2365,10 +2903,8 @@ TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) delete (*d); ++d; } - if (can_solve) { - MetricPositionChanged (); // Emit Signal - } - return can_solve; + + MetricPositionChanged (); // Emit Signal } framecnt_t @@ -2376,13 +2912,11 @@ TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) { Glib::Threads::RWLock::ReaderLock lm (lock); - double const tick_at_time = beat_at_frame_locked (_metrics, pos) * BBT_Time::ticks_per_beat; - double const bbt_ticks = bbt.ticks + (bbt.beats * BBT_Time::ticks_per_beat); - double const total_beats = (tick_at_time + bbt_ticks) / BBT_Time::ticks_per_beat; - framecnt_t const time_at_bbt = frame_at_beat_locked (_metrics, total_beats); - framecnt_t const ret = time_at_bbt; + const double tick_at_time = beat_at_frame_locked (_metrics, pos) * BBT_Time::ticks_per_beat; + const double bbt_ticks = bbt.ticks + (bbt.beats * BBT_Time::ticks_per_beat); + const double total_beats = (tick_at_time + bbt_ticks) / BBT_Time::ticks_per_beat; - return ret; + return frame_at_beat_locked (_metrics, total_beats); } framepos_t @@ -2488,24 +3022,35 @@ TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir) } } - framepos_t const ret_frame = frame_at_beat_locked (_metrics, beats + (ticks / BBT_Time::ticks_per_beat)); + const framepos_t ret_frame = frame_at_beat_locked (_metrics, beats + (ticks / BBT_Time::ticks_per_beat)); return ret_frame; } void -TempoMap::round_bbt (BBT_Time& when, const int32_t& sub_num) +TempoMap::round_bbt (BBT_Time& when, const int32_t& sub_num, RoundMode dir) { if (sub_num == -1) { - const double bpb = meter_section_at (bbt_to_beats_locked (_metrics, when)).divisions_per_bar(); - if ((double) when.beats > bpb / 2.0) { + if (dir > 0) { ++when.bars; + when.beats = 1; + when.ticks = 0; + } else if (dir < 0) { + when.beats = 1; + when.ticks = 0; + } else { + const double bpb = meter_section_at_beat (bbt_to_beats_locked (_metrics, when)).divisions_per_bar(); + if ((double) when.beats > bpb / 2.0) { + ++when.bars; + } + when.beats = 1; + when.ticks = 0; } - when.beats = 1; - when.ticks = 0; + return; + } else if (sub_num == 0) { - const double bpb = meter_section_at (bbt_to_beats_locked (_metrics, when)).divisions_per_bar(); + const double bpb = meter_section_at_beat (bbt_to_beats_locked (_metrics, when)).divisions_per_bar(); if ((double) when.ticks > BBT_Time::ticks_per_beat / 2.0) { ++when.beats; while ((double) when.beats > bpb) { @@ -2514,32 +3059,76 @@ TempoMap::round_bbt (BBT_Time& when, const int32_t& sub_num) } } when.ticks = 0; + return; } + const uint32_t ticks_one_subdivisions_worth = BBT_Time::ticks_per_beat / sub_num; - double rem; - if ((rem = fmod ((double) when.ticks, (double) ticks_one_subdivisions_worth)) > (ticks_one_subdivisions_worth / 2.0)) { - /* closer to the next subdivision, so shift forward */ - when.ticks = when.ticks + (ticks_one_subdivisions_worth - rem); + if (dir > 0) { + /* round to next (or same iff dir == RoundUpMaybe) */ - if (when.ticks > Timecode::BBT_Time::ticks_per_beat) { - ++when.beats; - when.ticks -= Timecode::BBT_Time::ticks_per_beat; + uint32_t mod = when.ticks % ticks_one_subdivisions_worth; + + if (mod == 0 && dir == RoundUpMaybe) { + /* right on the subdivision, which is fine, so do nothing */ + + } else if (mod == 0) { + /* right on the subdivision, so the difference is just the subdivision ticks */ + when.ticks += ticks_one_subdivisions_worth; + + } else { + /* not on subdivision, compute distance to next subdivision */ + + when.ticks += ticks_one_subdivisions_worth - mod; } - } else if (rem > 0) { - /* closer to previous subdivision, so shift backward */ + if (when.ticks >= BBT_Time::ticks_per_beat) { + when.ticks -= BBT_Time::ticks_per_beat; + } - if (rem > when.ticks) { - if (when.beats == 0) { - /* can't go backwards past zero, so ... */ - } - /* step back to previous beat */ - --when.beats; - when.ticks = Timecode::BBT_Time::ticks_per_beat - rem; + } else if (dir < 0) { + /* round to previous (or same iff dir == RoundDownMaybe) */ + + uint32_t difference = when.ticks % ticks_one_subdivisions_worth; + + if (difference == 0 && dir == RoundDownAlways) { + /* right on the subdivision, but force-rounding down, + so the difference is just the subdivision ticks */ + difference = ticks_one_subdivisions_worth; + } + + if (when.ticks < difference) { + when.ticks = BBT_Time::ticks_per_beat - when.ticks; } else { - when.ticks = when.ticks - rem; + when.ticks -= difference; + } + + } else { + /* round to nearest */ double rem; + if ((rem = fmod ((double) when.ticks, (double) ticks_one_subdivisions_worth)) > (ticks_one_subdivisions_worth / 2.0)) { + /* closer to the next subdivision, so shift forward */ + + when.ticks = when.ticks + (ticks_one_subdivisions_worth - rem); + + if (when.ticks > Timecode::BBT_Time::ticks_per_beat) { + ++when.beats; + when.ticks -= Timecode::BBT_Time::ticks_per_beat; + } + + } else if (rem > 0) { + /* closer to previous subdivision, so shift backward */ + + if (rem > when.ticks) { + if (when.beats == 0) { + /* can't go backwards past zero, so ... */ + } + /* step back to previous beat */ + --when.beats; + when.ticks = Timecode::BBT_Time::ticks_per_beat - rem; + } else { + when.ticks = when.ticks - rem; + } } } } @@ -2549,7 +3138,7 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) { Glib::Threads::RWLock::ReaderLock lm (lock); - double const beat_at_framepos = beat_at_frame_locked (_metrics, frame); + const double beat_at_framepos = beat_at_frame_locked (_metrics, frame); BBT_Time bbt (beats_to_bbt_locked (_metrics, beat_at_framepos)); switch (type) { @@ -2558,22 +3147,22 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) /* find bar previous to 'frame' */ bbt.beats = 1; bbt.ticks = 0; - return frame_time (bbt); + return frame_time_locked (_metrics, bbt); } else if (dir > 0) { /* find bar following 'frame' */ ++bbt.bars; bbt.beats = 1; bbt.ticks = 0; - return frame_time (bbt); + return frame_time_locked (_metrics, bbt); } else { /* true rounding: find nearest bar */ - framepos_t raw_ft = frame_time (bbt); + framepos_t raw_ft = frame_time_locked (_metrics, bbt); bbt.beats = 1; bbt.ticks = 0; - framepos_t prev_ft = frame_time (bbt); + framepos_t prev_ft = frame_time_locked (_metrics, bbt); ++bbt.bars; - framepos_t next_ft = frame_time (bbt); + framepos_t next_ft = frame_time_locked (_metrics, bbt); if ((raw_ft - prev_ft) > (next_ft - prev_ft) / 2) { return next_ft; @@ -2603,19 +3192,18 @@ TempoMap::get_grid (vector& points, framepos_t lower, framepos_t upper) { Glib::Threads::RWLock::ReaderLock lm (lock); - int32_t const upper_beat = (int32_t) ceil (beat_at_frame_locked (_metrics, upper)); - int32_t cnt = floor (beat_at_frame_locked (_metrics, lower)); + int32_t cnt = ceil (beat_at_frame_locked (_metrics, lower)); + framecnt_t pos = 0; /* although the map handles negative beats, bbt doesn't. */ if (cnt < 0.0) { cnt = 0.0; } - while (cnt <= upper_beat) { - framecnt_t pos = frame_at_beat_locked (_metrics, cnt); - TempoSection const tempo = tempo_section_at_locked (pos); - MeterSection const meter = meter_section_at_locked (pos); - BBT_Time const bbt = beats_to_bbt (cnt); - BBTPoint point = BBTPoint (meter, tempo_at_locked (pos), pos, bbt.bars, bbt.beats, tempo.get_c_func()); - points.push_back (point); + while (pos < upper) { + pos = frame_at_beat_locked (_metrics, cnt); + const TempoSection tempo = tempo_section_at_locked (_metrics, pos); + const MeterSection meter = meter_section_at_locked (_metrics, pos); + const BBT_Time bbt = beats_to_bbt (cnt); + points.push_back (BBTPoint (meter, tempo_at_locked (_metrics, pos), pos, bbt.bars, bbt.beats, tempo.c_func())); ++cnt; } } @@ -2624,23 +3212,23 @@ const TempoSection& TempoMap::tempo_section_at (framepos_t frame) const { Glib::Threads::RWLock::ReaderLock lm (lock); - return tempo_section_at_locked (frame); + return tempo_section_at_locked (_metrics, frame); } const TempoSection& -TempoMap::tempo_section_at_locked (framepos_t frame) const +TempoMap::tempo_section_at_locked (const Metrics& metrics, framepos_t frame) const { Metrics::const_iterator i; TempoSection* prev = 0; - for (i = _metrics.begin(); i != _metrics.end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { TempoSection* t; if ((t = dynamic_cast (*i)) != 0) { if (!t->active()) { continue; } - if (t->frame() > frame) { + if (prev && t->frame() > frame) { break; } @@ -2656,6 +3244,42 @@ TempoMap::tempo_section_at_locked (framepos_t frame) const return *prev; } +const TempoSection& +TempoMap::tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const +{ + TempoSection* prev_t = 0; + const MeterSection* prev_m = &meter_section_at_beat_locked (metrics, beat); + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* t; + if ((t = dynamic_cast (*i)) != 0) { + if (prev_t && ((t->pulse() - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat() > beat) { + break; + } + prev_t = t; + } + + } + return *prev_t; +} + +const TempoSection& +TempoMap::tempo_section_at_pulse_locked (const Metrics& metrics, const double& pulse) const +{ + TempoSection* prev_t = 0; + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* t; + if ((t = dynamic_cast (*i)) != 0) { + if (prev_t && t->pulse() > pulse) { + break; + } + prev_t = t; + } + + } + return *prev_t; +} /* don't use this to calculate length (the tempo is only correct for this frame). do that stuff based on the beat_at_frame and frame_at_beat api @@ -2665,7 +3289,7 @@ TempoMap::frames_per_beat_at (const framepos_t& frame, const framecnt_t& sr) con { Glib::Threads::RWLock::ReaderLock lm (lock); - const TempoSection* ts_at = &tempo_section_at_locked (frame); + const TempoSection* ts_at = &tempo_section_at_locked (_metrics, frame); const TempoSection* ts_after = 0; Metrics::const_iterator i; @@ -2691,16 +3315,9 @@ TempoMap::frames_per_beat_at (const framepos_t& frame, const framecnt_t& sr) con } const Tempo -TempoMap::tempo_at (const framepos_t& frame) const -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - return tempo_at_locked (frame); -} - -const Tempo -TempoMap::tempo_at_locked (const framepos_t& frame) const +TempoMap::tempo_at_locked (const Metrics& metrics, const framepos_t& frame) const { - TempoSection* prev_ts = 0; + TempoSection* prev_t = 0; Metrics::const_iterator i; @@ -2710,37 +3327,36 @@ TempoMap::tempo_at_locked (const framepos_t& frame) const if (!t->active()) { continue; } - if ((prev_ts) && t->frame() > frame) { + if ((prev_t) && t->frame() > frame) { /* t is the section past frame */ - double const ret = prev_ts->tempo_at_frame (frame, _frame_rate) * prev_ts->note_type(); - Tempo const ret_tempo (ret, prev_ts->note_type()); + const double ret_bpm = prev_t->tempo_at_frame (frame, _frame_rate) * prev_t->note_type(); + const Tempo ret_tempo (ret_bpm, prev_t->note_type()); return ret_tempo; } - prev_ts = t; + prev_t = t; } } - double const ret = prev_ts->beats_per_minute(); - Tempo const ret_tempo (ret, prev_ts->note_type ()); + const double ret = prev_t->beats_per_minute(); + const Tempo ret_tempo (ret, prev_t->note_type ()); return ret_tempo; } -const MeterSection& -TempoMap::meter_section_at (framepos_t frame) const +const Tempo +TempoMap::tempo_at (const framepos_t& frame) const { Glib::Threads::RWLock::ReaderLock lm (lock); - return meter_section_at_locked (frame); + return tempo_at_locked (_metrics, frame); } const MeterSection& -TempoMap::meter_section_at_locked (framepos_t frame) const +TempoMap::meter_section_at_locked (const Metrics& metrics, framepos_t frame) const { - //framepos_t const frame_off = frame + frame_offset_at (_metrics, frame); Metrics::const_iterator i; MeterSection* prev = 0; - for (i = _metrics.begin(); i != _metrics.end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { @@ -2761,30 +3377,106 @@ TempoMap::meter_section_at_locked (framepos_t frame) const return *prev; } -const Meter& -TempoMap::meter_at (framepos_t frame) const + +const MeterSection& +TempoMap::meter_section_at (framepos_t frame) const { - TempoMetric m (metric_at (frame)); - return m.meter(); + Glib::Threads::RWLock::ReaderLock lm (lock); + return meter_section_at_locked (_metrics, frame); } const MeterSection& -TempoMap::meter_section_at (const double& beat) const +TempoMap::meter_section_at_beat_locked (const Metrics& metrics, const double& beat) const { - MeterSection* prev_ms = 0; - Glib::Threads::RWLock::ReaderLock lm (lock); + MeterSection* prev_m = 0; - for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { MeterSection* m; if ((m = dynamic_cast (*i)) != 0) { - if (prev_ms && m->beat() > beat) { + if (prev_m && m->beat() > beat) { break; } - prev_ms = m; + prev_m = m; } } - return *prev_ms; + return *prev_m; +} + +const MeterSection& +TempoMap::meter_section_at_beat (double beat) const +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + return meter_section_at_beat_locked (_metrics, beat); +} + +const Meter& +TempoMap::meter_at (framepos_t frame) const +{ + TempoMetric m (metric_at (frame)); + return m.meter(); +} + +void +TempoMap::fix_legacy_session () +{ + MeterSection* prev_m = 0; + TempoSection* prev_t = 0; + + for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + MeterSection* m; + TempoSection* t; + + if ((m = dynamic_cast(*i)) != 0) { + if (!m->movable()) { + pair bbt = make_pair (0.0, BBT_Time (1, 1, 0)); + m->set_beat (bbt); + m->set_pulse (0.0); + m->set_frame (0); + m->set_position_lock_style (AudioTime); + prev_m = m; + continue; + } + if (prev_m) { + pair start = make_pair (((m->bbt().bars - 1) * prev_m->note_divisor()) + + (m->bbt().beats - 1) + + (m->bbt().ticks / BBT_Time::ticks_per_beat) + , m->bbt()); + m->set_beat (start); + const double start_beat = ((m->bbt().bars - 1) * prev_m->note_divisor()) + + (m->bbt().beats - 1) + + (m->bbt().ticks / BBT_Time::ticks_per_beat); + m->set_pulse (start_beat / prev_m->note_divisor()); + } + prev_m = m; + } else if ((t = dynamic_cast(*i)) != 0) { + + if (!t->active()) { + continue; + } + + if (!t->movable()) { + t->set_pulse (0.0); + t->set_frame (0); + t->set_position_lock_style (AudioTime); + prev_t = t; + continue; + } + + if (prev_t) { + const double beat = ((t->legacy_bbt().bars - 1) * ((prev_m) ? prev_m->note_divisor() : 4.0)) + + (t->legacy_bbt().beats - 1) + + (t->legacy_bbt().ticks / BBT_Time::ticks_per_beat); + if (prev_m) { + t->set_pulse (beat / prev_m->note_divisor()); + } else { + /* really shouldn't happen but.. */ + t->set_pulse (beat / 4.0); + } + } + prev_t = t; + } + } } XMLNode& @@ -2851,32 +3543,19 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) MetricSectionSorter cmp; _metrics.sort (cmp); } + /* check for legacy sessions where bbt was the base musical unit for tempo */ - for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { - MeterSection* m; + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { TempoSection* t; - MeterSection* prev_ms = 0; - TempoSection* prev_ts = 0; - if ((m = dynamic_cast(*i)) != 0) { - if (prev_ms && prev_ms->pulse() < 0.0) { - /*XX we cannot possibly make this work??. */ - pair start = make_pair (((prev_ms->bbt().bars - 1) * prev_ms->note_divisor()) + (prev_ms->bbt().beats - 1) + (prev_ms->bbt().ticks / BBT_Time::ticks_per_beat), prev_ms->bbt()); - prev_ms->set_beat (start); - const double start_pulse = ((prev_ms->bbt().bars - 1) * prev_ms->note_divisor()) + (prev_ms->bbt().beats - 1) + (prev_ms->bbt().ticks / BBT_Time::ticks_per_beat); - prev_ms->set_pulse (start_pulse); - } - prev_ms = m; - } else if ((t = dynamic_cast(*i)) != 0) { - if (!t->active()) { - continue; - } - if (prev_ts && prev_ts->pulse() < 0.0) { - double const start = ((prev_ts->legacy_bbt().bars - 1) * prev_ms->note_divisor()) + (prev_ts->legacy_bbt().beats - 1) + (prev_ts->legacy_bbt().ticks / BBT_Time::ticks_per_beat); - prev_ts->set_pulse (start); + if ((t = dynamic_cast (*i)) != 0) { + if (t->legacy_bbt().bars != 0) { + fix_legacy_session(); + break; } - prev_ts = t; + break; } } + /* check for multiple tempo/meters at the same location, which ardour2 somehow allowed. */ @@ -2885,19 +3564,19 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { if (prev != _metrics.end()) { MeterSection* ms; - MeterSection* prev_ms; + MeterSection* prev_m; TempoSection* ts; - TempoSection* prev_ts; - if ((prev_ms = dynamic_cast(*prev)) != 0 && (ms = dynamic_cast(*i)) != 0) { - if (prev_ms->pulse() == ms->pulse()) { - cerr << string_compose (_("Multiple meter definitions found at %1"), prev_ms->pulse()) << endmsg; - error << string_compose (_("Multiple meter definitions found at %1"), prev_ms->pulse()) << endmsg; + TempoSection* prev_t; + if ((prev_m = dynamic_cast(*prev)) != 0 && (ms = dynamic_cast(*i)) != 0) { + if (prev_m->pulse() == ms->pulse()) { + cerr << string_compose (_("Multiple meter definitions found at %1"), prev_m->pulse()) << endmsg; + error << string_compose (_("Multiple meter definitions found at %1"), prev_m->pulse()) << endmsg; return -1; } - } else if ((prev_ts = dynamic_cast(*prev)) != 0 && (ts = dynamic_cast(*i)) != 0) { - if (prev_ts->pulse() == ts->pulse()) { - cerr << string_compose (_("Multiple tempo definitions found at %1"), prev_ts->pulse()) << endmsg; - error << string_compose (_("Multiple tempo definitions found at %1"), prev_ts->pulse()) << endmsg; + } else if ((prev_t = dynamic_cast(*prev)) != 0 && (ts = dynamic_cast(*i)) != 0) { + if (prev_t->pulse() == ts->pulse()) { + cerr << string_compose (_("Multiple tempo definitions found at %1"), prev_t->pulse()) << endmsg; + error << string_compose (_("Multiple tempo definitions found at %1"), prev_t->pulse()) << endmsg; return -1; } } @@ -2919,7 +3598,7 @@ TempoMap::dump (const Metrics& metrics, std::ostream& o) const Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); const MeterSection* m; const TempoSection* t; - const TempoSection* prev_ts = 0; + const TempoSection* prev_t = 0; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { @@ -2927,11 +3606,11 @@ TempoMap::dump (const Metrics& metrics, std::ostream& o) const o << "Tempo @ " << *i << t->beats_per_minute() << " BPM (pulse = 1/" << t->note_type() << ") at " << t->pulse() << " frame= " << t->frame() << " (movable? " << t->movable() << ')' << " pos lock: " << enum_2_string (t->position_lock_style()) << std::endl; o << "current : " << t->beats_per_minute() << " | " << t->pulse() << " | " << t->frame() << std::endl; - if (prev_ts) { - o << "previous : " << prev_ts->beats_per_minute() << " | " << prev_ts->pulse() << " | " << prev_ts->frame() << std::endl; - o << "calculated : " << prev_ts->tempo_at_pulse (t->pulse()) * prev_ts->note_type() << " | " << prev_ts->pulse_at_tempo (t->pulses_per_minute(), t->frame(), _frame_rate) << " | " << prev_ts->frame_at_tempo (t->pulses_per_minute(), t->pulse(), _frame_rate) << std::endl; + if (prev_t) { + o << "previous : " << prev_t->beats_per_minute() << " | " << prev_t->pulse() << " | " << prev_t->frame() << std::endl; + o << "calculated : " << prev_t->tempo_at_pulse (t->pulse()) * prev_t->note_type() << " | " << prev_t->pulse_at_tempo (t->pulses_per_minute(), t->frame(), _frame_rate) << " | " << prev_t->frame_at_tempo (t->pulses_per_minute(), t->pulse(), _frame_rate) << std::endl; } - prev_ts = t; + prev_t = t; } else if ((m = dynamic_cast(*i)) != 0) { o << "Meter @ " << *i << ' ' << m->divisions_per_bar() << '/' << m->note_divisor() << " at " << m->bbt() << " frame= " << m->frame() << " pulse: " << m->pulse() << " beat : " << m->beat() << " pos lock: " << enum_2_string (m->position_lock_style()) << " (movable? " << m->movable() << ')' << endl; @@ -3187,10 +3866,10 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const } pos_bbt.beats += op.beats; /* the meter in effect will start on the bar */ - double divisions_per_bar = meter_section_at (bbt_to_beats_locked (_metrics, BBT_Time (pos_bbt.bars + op.bars, 1, 0))).divisions_per_bar(); + double divisions_per_bar = meter_section_at_beat (bbt_to_beats_locked (_metrics, BBT_Time (pos_bbt.bars + op.bars, 1, 0))).divisions_per_bar(); while (pos_bbt.beats >= divisions_per_bar + 1) { ++pos_bbt.bars; - divisions_per_bar = meter_section_at (bbt_to_beats_locked (_metrics, BBT_Time (pos_bbt.bars + op.bars, 1, 0))).divisions_per_bar(); + divisions_per_bar = meter_section_at_beat (bbt_to_beats_locked (_metrics, BBT_Time (pos_bbt.bars + op.bars, 1, 0))).divisions_per_bar(); pos_bbt.beats -= divisions_per_bar; } pos_bbt.bars += op.bars;