X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftempo.cc;h=3865fe3e197ba05575a8885c8a26c5ac12333a86;hb=f3ada6f89347d1230cb2ce3a10582ab769c321af;hp=0565f66f7c534c061f1457da7aabf1fff3fe451f;hpb=35ec9b33cf9a622f0692cca6cde856ea1a4a3962;p=ardour.git diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 0565f66f7c..3865fe3e19 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -45,7 +45,7 @@ using Timecode::BBT_Time; /* _default tempo is 4/4 qtr=120 */ Meter TempoMap::_default_meter (4.0, 4.0); -Tempo TempoMap::_default_tempo (120.0); +Tempo TempoMap::_default_tempo (120.0, 4.0, 120.0); framepos_t MetricSection::frame_at_minute (const double& time) const @@ -71,7 +71,7 @@ Meter::frames_per_grid (const Tempo& tempo, framecnt_t sr) const The return value IS NOT interpretable in terms of "beats". */ - return (60.0 * sr) / (tempo.note_types_per_minute() * (_note_type/tempo.note_type())); + return (60.0 * sr) / (tempo.note_types_per_minute() * (_note_type / tempo.note_type())); } double @@ -87,17 +87,16 @@ const string TempoSection::xml_state_node_name = "Tempo"; TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) : MetricSection (0.0, 0, MusicTime, true, sample_rate) , Tempo (TempoMap::default_tempo()) - , _c_func (0.0) + , _c (0.0) , _active (true) , _locked_to_meter (false) + , _legacy_end (false) { XMLProperty const * prop; LocaleGuard lg; BBT_Time bbt; double pulse; uint32_t frame; - double minute; - bool had_beats_per_minute = false; _legacy_bbt = BBT_Time (0, 0, 0); @@ -124,37 +123,18 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) 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; + throw failed_constructor(); } else { set_minute (minute_at_frame (frame)); } } - if ((prop = node.property ("minute")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &minute) != 1) { - error << _("TempoSection XML node has an illegal \"minute\" value") << endmsg; - } else { - set_minute (minute); - } - } - - /* replace old beats-per-minute with note-types-per-minute */ + /* XX replace old beats-per-minute name with note-types-per-minute */ if ((prop = node.property ("beats-per-minute")) != 0) { - info << _("Renaming legacy \"beats-per-minute\" XML node to note-types-per-minute") << endmsg; - if (sscanf (prop->value().c_str(), "%lf", &_note_types_per_minute) != 1 || _note_types_per_minute < 0.0) { - error << _("TempoSection XML node has an illegal \"beats-per-minutee\" value") << endmsg; - throw failed_constructor(); - } - had_beats_per_minute = true; - } - - if ((prop = node.property ("note-types-per-minute")) != 0) { if (sscanf (prop->value().c_str(), "%lf", &_note_types_per_minute) != 1 || _note_types_per_minute < 0.0) { - error << _("TempoSection XML node has an illegal \"note-types-per-minute\" value") << endmsg; + error << _("TempoSection XML node has an illegal \"beats-per-minute\" value") << endmsg; throw failed_constructor(); } - } else if (!had_beats_per_minute) { - error << _("TempoSection XML node has no \"note-types-per-minute\" or \"beats-per-minute\" property") << endmsg; - throw failed_constructor(); } if ((prop = node.property ("note-type")) == 0) { @@ -164,7 +144,28 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) if (sscanf (prop->value().c_str(), "%lf", &_note_type) != 1 || _note_type < 1.0) { error << _("TempoSection XML node has an illegal \"note-type\" value") << endmsg; throw failed_constructor(); + } + } + + /* XX replace old end-beats-per-minute name with note-types-per-minute */ + if ((prop = node.property ("end-beats-per-minute")) != 0) { + if (sscanf (prop->value().c_str(), "%lf", &_end_note_types_per_minute) != 1 || _end_note_types_per_minute < 0.0) { + info << _("TempoSection XML node has an illegal \"in-beats-per-minute\" value") << endmsg; + //throw failed_constructor(); + _end_note_types_per_minute = _note_types_per_minute; + _legacy_end = true; + } + } else { + _legacy_end = true; } + + if ((prop = node.property ("tempo-type")) != 0) { + TempoSection::Type old_type; + + old_type = Type (string_2_enum (prop->value(), old_type)); + if (old_type == TempoSection::Constant) { + _end_note_types_per_minute = _note_types_per_minute; + } } if ((prop = node.property ("movable")) == 0) { @@ -172,7 +173,7 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) throw failed_constructor(); } - set_movable (string_is_affirmative (prop->value())); + set_initial (!string_is_affirmative (prop->value())); if ((prop = node.property ("active")) == 0) { warning << _("TempoSection XML node has no \"active\" property") << endmsg; @@ -181,14 +182,8 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) set_active (string_is_affirmative (prop->value())); } - if ((prop = node.property ("tempo-type")) == 0) { - _type = Constant; - } else { - _type = Type (string_2_enum (prop->value(), _type)); - } - if ((prop = node.property ("lock-style")) == 0) { - if (movable()) { + if (!initial()) { set_position_lock_style (MusicTime); } else { set_position_lock_style (AudioTime); @@ -198,10 +193,19 @@ TempoSection::TempoSection (const XMLNode& node, framecnt_t sample_rate) } if ((prop = node.property ("locked-to-meter")) == 0) { - set_locked_to_meter (false); + if (initial()) { + set_locked_to_meter (true); + } else { + set_locked_to_meter (false); + } } else { set_locked_to_meter (string_is_affirmative (prop->value())); } + + /* 5.5 marked initial tempo as not locked to meter. this should always be true anyway */ + if (initial()) { + set_locked_to_meter (true); + } } XMLNode& @@ -215,40 +219,33 @@ TempoSection::get_state() const root->add_property ("pulse", buf); snprintf (buf, sizeof (buf), "%li", frame()); root->add_property ("frame", buf); - snprintf (buf, sizeof (buf), "%lf", minute()); - root->add_property ("minute", buf); snprintf (buf, sizeof (buf), "%lf", _note_types_per_minute); - root->add_property ("note-types-per-minute", buf); + root->add_property ("beats-per-minute", buf); snprintf (buf, sizeof (buf), "%lf", _note_type); root->add_property ("note-type", buf); - snprintf (buf, sizeof (buf), "%s", movable()?"yes":"no"); + snprintf (buf, sizeof (buf), "%lf", _end_note_types_per_minute); + root->add_property ("end-beats-per-minute", buf); + snprintf (buf, sizeof (buf), "%s", !initial()?"yes":"no"); root->add_property ("movable", buf); snprintf (buf, sizeof (buf), "%s", active()?"yes":"no"); 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; } -void -TempoSection::set_type (Type type) -{ - _type = type; -} - /** returns the Tempo at the session-relative minute. */ Tempo TempoSection::tempo_at_minute (const double& m) const { - - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && m < minute()); + if (constant) { return Tempo (note_types_per_minute(), note_type()); } - return Tempo (_tempo_at_time (m - minute()), _note_type); + return Tempo (_tempo_at_time (m - minute()), _note_type, _end_note_types_per_minute); } /** returns the session relative minute where the supplied tempo in note types per minute occurs. @@ -260,17 +257,17 @@ TempoSection::tempo_at_minute (const double& m) const * */ -/** user feedback dictates that if tempoA (120, 4.0) precedes tempoB (120, 8.0), - * there will be no ramp between the two even if set to ramped. +/** if tempoA (120, 4.0) precedes tempoB (120, 8.0), + * there should be no ramp between the two even if we are ramped. * in other words a ramp should only place a curve on note_types_per_minute. * we should be able to use Tempo note type here, but the above * complicates things a bit. - * we would ideally like to use arbitrary Tempo structs here. */ double TempoSection::minute_at_ntpm (const double& ntpm, const double& p) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && p < pulse()); + if (constant) { return ((p - pulse()) / pulses_per_minute()) + minute(); } @@ -282,12 +279,13 @@ TempoSection::minute_at_ntpm (const double& ntpm, const double& p) const Tempo TempoSection::tempo_at_pulse (const double& p) const { + const bool constant = type() == Constant || _c == 0.0 || (initial() && p < pulse()); - if (_type == Constant || _c_func == 0.0) { + if (constant) { return Tempo (note_types_per_minute(), note_type()); } - return Tempo (_tempo_at_pulse (p - pulse()), _note_type); + return Tempo (_tempo_at_pulse (p - pulse()), _note_type, _end_note_types_per_minute); } /** returns the whole-note pulse where a tempo in note types per minute occurs. @@ -303,7 +301,8 @@ TempoSection::tempo_at_pulse (const double& p) const double TempoSection::pulse_at_ntpm (const double& ntpm, const double& m) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && m < minute()); + if (constant) { return ((m - minute()) * pulses_per_minute()) + pulse(); } @@ -315,7 +314,8 @@ TempoSection::pulse_at_ntpm (const double& ntpm, const double& m) const double TempoSection::pulse_at_minute (const double& m) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && m < minute()); + if (constant) { return ((m - minute()) * pulses_per_minute()) + pulse(); } @@ -327,17 +327,25 @@ TempoSection::pulse_at_minute (const double& m) const double TempoSection::minute_at_pulse (const double& p) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && p < pulse()); + if (constant) { return ((p - pulse()) / pulses_per_minute()) + minute(); } return _time_at_pulse (p - pulse()) + minute(); } +/** returns thw whole-note pulse at session frame position f. + * @param f the frame position. + * @return the position in whole-note pulses corresponding to f + * + * for use with musical units whose granularity is coarser than frames (e.g. ticks) +*/ double TempoSection::pulse_at_frame (const framepos_t& f) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && f < frame()); + if (constant) { return (minute_at_frame (f - frame()) * pulses_per_minute()) + pulse(); } @@ -347,7 +355,8 @@ TempoSection::pulse_at_frame (const framepos_t& f) const framepos_t TempoSection::frame_at_pulse (const double& p) const { - if (_type == Constant || _c_func == 0.0) { + const bool constant = type() == Constant || _c == 0.0 || (initial() && p < pulse()); + if (constant) { return frame_at_minute (((p - pulse()) / pulses_per_minute()) + minute()); } @@ -435,8 +444,12 @@ https://www.zhdk.ch/fileadmin/data_subsites/data_icst/Downloads/Timegrid/ICST_Te * @return the calculated function constant */ double -TempoSection::compute_c_func_pulse (const double& end_npm, const double& end_pulse) const +TempoSection::compute_c_pulse (const double& end_npm, const double& end_pulse) const { + if (note_types_per_minute() == end_npm || type() == Constant) { + return 0.0; + } + double const log_tempo_ratio = log (end_npm / note_types_per_minute()); return (note_types_per_minute() * expm1 (log_tempo_ratio)) / ((end_pulse - pulse()) * _note_type); } @@ -447,16 +460,20 @@ TempoSection::compute_c_func_pulse (const double& end_npm, const double& end_pul * @return the calculated function constant */ double -TempoSection::compute_c_func_minute (const double& end_npm, const double& end_minute) const +TempoSection::compute_c_minute (const double& end_npm, const double& end_minute) const { + if (note_types_per_minute() == end_npm || type() == Constant) { + return 0.0; + } + return c_func (end_npm, end_minute - minute()); } /* position function */ double -TempoSection::a_func (double end_npm, double c_func) const +TempoSection::a_func (double end_npm, double c) const { - return log (end_npm / note_types_per_minute()) / c_func; + return log (end_npm / note_types_per_minute()) / c; } /*function constant*/ @@ -470,42 +487,42 @@ TempoSection::c_func (double end_npm, double end_time) const double TempoSection::_tempo_at_time (const double& time) const { - return exp (_c_func * time) * note_types_per_minute(); + return exp (_c * time) * note_types_per_minute(); } /* time in minutes at tempo in note types per minute */ double TempoSection::_time_at_tempo (const double& npm) const { - return log (npm / note_types_per_minute()) / _c_func; + return log (npm / note_types_per_minute()) / _c; } /* pulse at tempo in note types per minute */ double TempoSection::_pulse_at_tempo (const double& npm) const { - return ((npm - note_types_per_minute()) / _c_func) / _note_type; + return ((npm - note_types_per_minute()) / _c) / _note_type; } /* tempo in note types per minute at pulse */ double TempoSection::_tempo_at_pulse (const double& pulse) const { - return (pulse * _note_type * _c_func) + note_types_per_minute(); + return (pulse * _note_type * _c) + note_types_per_minute(); } /* pulse at time in minutes */ double TempoSection::_pulse_at_time (const double& time) const { - return (expm1 (_c_func * time) * (note_types_per_minute() / _c_func)) / _note_type; + return (expm1 (_c * time) * (note_types_per_minute() / _c)) / _note_type; } /* time in minutes at pulse */ double TempoSection::_time_at_pulse (const double& pulse) const { - return log1p ((_c_func * pulse * _note_type) / note_types_per_minute()) / _c_func; + return log1p ((_c * pulse * _note_type) / note_types_per_minute()) / _c; } /***********************************************************************/ @@ -522,7 +539,6 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) double beat = 0.0; framepos_t frame = 0; pair start; - double minute = 0.0; if ((prop = node.property ("start")) != 0) { if (sscanf (prop->value().c_str(), "%" PRIu32 "|%" PRIu32 "|%" PRIu32, @@ -568,17 +584,11 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) if ((prop = node.property ("frame")) != 0) { if (sscanf (prop->value().c_str(), "%li", &frame) != 1) { error << _("MeterSection XML node has an illegal \"frame\" value") << endmsg; + throw failed_constructor(); } else { set_minute (minute_at_frame (frame)); } } - if ((prop = node.property ("minute")) != 0) { - if (sscanf (prop->value().c_str(), "%lf", &minute) != 1) { - error << _("MeterSection XML node has an illegal \"frame\" value") << endmsg; - } else { - set_minute (minute); - } - } /* beats-per-bar is old; divisions-per-bar is new */ @@ -607,11 +617,11 @@ MeterSection::MeterSection (const XMLNode& node, const framecnt_t sample_rate) throw failed_constructor(); } - set_movable (string_is_affirmative (prop->value())); + set_initial (!string_is_affirmative (prop->value())); if ((prop = node.property ("lock-style")) == 0) { warning << _("MeterSection XML node has no \"lock-style\" property") << endmsg; - if (movable()) { + if (!initial()) { set_position_lock_style (MusicTime); } else { set_position_lock_style (AudioTime); @@ -641,12 +651,10 @@ MeterSection::get_state() const root->add_property ("note-type", buf); snprintf (buf, sizeof (buf), "%li", frame()); root->add_property ("frame", buf); - snprintf (buf, sizeof (buf), "%lf", minute()); - root->add_property ("minute", buf); root->add_property ("lock-style", enum_2_string (position_lock_style())); snprintf (buf, sizeof (buf), "%lf", _divisions_per_bar); root->add_property ("divisions-per-bar", buf); - snprintf (buf, sizeof (buf), "%s", movable()?"yes":"no"); + snprintf (buf, sizeof (buf), "%s", !initial()?"yes":"no"); root->add_property ("movable", buf); return *root; @@ -751,11 +759,13 @@ TempoMap::TempoMap (framecnt_t fr) _frame_rate = fr; BBT_Time start (1, 1, 0); - TempoSection *t = new TempoSection (0.0, 0.0, _default_tempo.note_types_per_minute(), _default_tempo.note_type(), TempoSection::Ramp, AudioTime, fr); + TempoSection *t = new TempoSection (0.0, 0.0, _default_tempo, AudioTime, fr); MeterSection *m = new MeterSection (0.0, 0.0, 0.0, start, _default_meter.divisions_per_bar(), _default_meter.note_divisor(), AudioTime, fr); - t->set_movable (false); - m->set_movable (false); + t->set_initial (true); + t->set_locked_to_meter (true); + + m->set_initial (true); /* note: frame time is correct (zero) for both of these */ @@ -764,6 +774,55 @@ TempoMap::TempoMap (framecnt_t fr) } +TempoMap::TempoMap (TempoMap const & other) +{ + _frame_rate = other._frame_rate; + for (Metrics::const_iterator m = other._metrics.begin(); m != other._metrics.end(); ++m) { + TempoSection* ts = dynamic_cast (*m); + MeterSection* ms = dynamic_cast (*m); + + if (ts) { + TempoSection* new_section = new TempoSection (*ts); + _metrics.push_back (new_section); + } else { + MeterSection* new_section = new MeterSection (*ms); + _metrics.push_back (new_section); + } + } +} + +TempoMap& +TempoMap::operator= (TempoMap const & other) +{ + if (&other != this) { + _frame_rate = other._frame_rate; + + Metrics::const_iterator d = _metrics.begin(); + while (d != _metrics.end()) { + delete (*d); + ++d; + } + _metrics.clear(); + + for (Metrics::const_iterator m = other._metrics.begin(); m != other._metrics.end(); ++m) { + TempoSection* ts = dynamic_cast (*m); + MeterSection* ms = dynamic_cast (*m); + + if (ts) { + TempoSection* new_section = new TempoSection (*ts); + _metrics.push_back (new_section); + } else { + MeterSection* new_section = new MeterSection (*ms); + _metrics.push_back (new_section); + } + } + } + + PropertyChanged (PropertyChange()); + + return *this; +} + TempoMap::~TempoMap () { Metrics::const_iterator d = _metrics.begin(); @@ -813,7 +872,7 @@ TempoMap::remove_tempo_locked (const TempoSection& tempo) for (i = _metrics.begin(); i != _metrics.end(); ++i) { if (dynamic_cast (*i) != 0) { if (tempo.frame() == (*i)->frame()) { - if ((*i)->movable()) { + if (!(*i)->initial()) { delete (*i); _metrics.erase (i); return true; @@ -865,7 +924,7 @@ TempoMap::remove_meter_locked (const MeterSection& meter) for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { if (dynamic_cast (*i) != 0) { if (meter.frame() == (*i)->frame()) { - if ((*i)->movable()) { + if (!(*i)->initial()) { delete (*i); _metrics.erase (i); return true; @@ -919,7 +978,7 @@ TempoMap::do_insert (MetricSection* section) bool const ipm = insert_tempo->position_lock_style() == MusicTime; if ((ipm && tempo->pulse() == insert_tempo->pulse()) || (!ipm && tempo->frame() == insert_tempo->frame())) { - if (!tempo->movable()) { + if (tempo->initial()) { /* can't (re)move this section, so overwrite * its data content (but not its properties as @@ -928,10 +987,6 @@ 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); @@ -948,7 +1003,7 @@ TempoMap::do_insert (MetricSection* section) if ((ipm && meter->beat() == insert_meter->beat()) || (!ipm && meter->frame() == insert_meter->frame())) { - if (!meter->movable()) { + if (meter->initial()) { /* can't (re)move this section, so overwrite * its data content (but not its properties as @@ -978,15 +1033,24 @@ TempoMap::do_insert (MetricSection* section) MeterSection* const insert_meter = dynamic_cast (section); TempoSection* const insert_tempo = dynamic_cast (section); Metrics::iterator i; + if (insert_meter) { + TempoSection* prev_t = 0; + for (i = _metrics.begin(); i != _metrics.end(); ++i) { MeterSection* const meter = dynamic_cast (*i); + bool const ipm = insert_meter->position_lock_style() == MusicTime; if (meter) { - bool const ipm = insert_meter->position_lock_style() == MusicTime; if ((ipm && meter->beat() > insert_meter->beat()) || (!ipm && meter->frame() > insert_meter->frame())) { break; } + } else { + if (prev_t && prev_t->locked_to_meter() && (!ipm && prev_t->frame() == insert_meter->frame())) { + break; + } + + prev_t = dynamic_cast (*i); } } } else if (insert_tempo) { @@ -995,7 +1059,9 @@ TempoMap::do_insert (MetricSection* section) if (tempo) { bool const ipm = insert_tempo->position_lock_style() == MusicTime; - if ((ipm && tempo->pulse() > insert_tempo->pulse()) || (!ipm && tempo->frame() > insert_tempo->frame())) { + const bool lm = insert_tempo->locked_to_meter(); + if ((ipm && tempo->pulse() > insert_tempo->pulse()) || (!ipm && tempo->frame() > insert_tempo->frame()) + || (lm && tempo->pulse() > insert_tempo->pulse())) { break; } } @@ -1003,19 +1069,42 @@ TempoMap::do_insert (MetricSection* section) } _metrics.insert (i, section); - //dump (_metrics, std::cout); + //dump (std::cout); } } /* user supplies the exact pulse if pls == MusicTime */ TempoSection* -TempoMap::add_tempo (const Tempo& tempo, const double& pulse, const framepos_t& frame, ARDOUR::TempoSection::Type type, PositionLockStyle pls) +TempoMap::add_tempo (const Tempo& tempo, const double& pulse, const framepos_t& frame, PositionLockStyle pls) { + if (tempo.note_types_per_minute() <= 0.0) { + warning << "Cannot add tempo. note types per minute must be greater than zero." << endmsg; + return 0; + } + TempoSection* ts = 0; + TempoSection* prev_tempo = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - ts = add_tempo_locked (tempo, pulse, minute_at_frame (frame), type, pls, true); - } + ts = add_tempo_locked (tempo, pulse, minute_at_frame (frame), pls, true); + for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + if ((*i)->is_tempo()) { + TempoSection* const this_t = static_cast (*i); + + bool const ipm = ts->position_lock_style() == MusicTime; + bool const lm = ts->locked_to_meter(); + if ((ipm && this_t->pulse() == ts->pulse()) || (!ipm && this_t->frame() == ts->frame()) + || (lm && this_t->pulse() == ts->pulse())) { + if (prev_tempo && prev_tempo->type() == TempoSection::Ramp) { + prev_tempo->set_end_note_types_per_minute (ts->note_types_per_minute()); + } + break; + } + prev_tempo = this_t; + } + } + recompute_map (_metrics); + } PropertyChanged (PropertyChange ()); @@ -1023,27 +1112,62 @@ TempoMap::add_tempo (const Tempo& tempo, const double& pulse, const framepos_t& } void -TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const double& pulse, const framepos_t& frame, TempoSection::Type type, PositionLockStyle pls) +TempoMap::replace_tempo (TempoSection& ts, const Tempo& tempo, const double& pulse, const framepos_t& frame, PositionLockStyle pls) { + if (tempo.note_types_per_minute() <= 0.0) { + warning << "Cannot replace tempo. note types per minute must be greater than zero." << endmsg; + return; + } + const bool locked_to_meter = ts.locked_to_meter(); + TempoSection* new_ts = 0; { Glib::Threads::RWLock::WriterLock lm (lock); TempoSection& first (first_tempo()); - if (ts.frame() != first.frame()) { - remove_tempo_locked (ts); - add_tempo_locked (tempo, pulse, minute_at_frame (frame), type, pls, true, locked_to_meter); + if (!ts.initial()) { + if (locked_to_meter) { + { + /* cannot move a meter-locked tempo section */ + *static_cast(&ts) = tempo; + recompute_map (_metrics); + } + } else { + remove_tempo_locked (ts); + new_ts = add_tempo_locked (tempo, pulse, minute_at_frame (frame), pls, true, locked_to_meter); + + if (new_ts && new_ts->type() == TempoSection::Constant) { + new_ts->set_end_note_types_per_minute (new_ts->note_types_per_minute()); + } else { + for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + + if ((*i)->is_tempo()) { + TempoSection* const this_t = static_cast (*i); + + bool const ipm = new_ts->position_lock_style() == MusicTime; + bool const lm = new_ts->locked_to_meter(); + if ((ipm && this_t->pulse() > new_ts->pulse()) || (!ipm && this_t->frame() > new_ts->frame()) + || (lm && this_t->pulse() > new_ts->pulse())) { + new_ts->set_end_note_types_per_minute (tempo.end_note_types_per_minute()); + + break; + } + } + } + } + } + } else { - first.set_type (type); first.set_pulse (0.0); first.set_minute (minute_at_frame (frame)); first.set_position_lock_style (AudioTime); + first.set_locked_to_meter (true); { /* cannot move the first tempo section */ *static_cast(&first) = tempo; - recompute_map (_metrics); } } + recompute_map (_metrics); } PropertyChanged (PropertyChange ()); @@ -1051,43 +1175,38 @@ TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const doubl TempoSection* TempoMap::add_tempo_locked (const Tempo& tempo, double pulse, double minute - , TempoSection::Type type, PositionLockStyle pls, bool recompute, bool locked_to_meter) + , PositionLockStyle pls, bool recompute, bool locked_to_meter) { - TempoSection* t = new TempoSection (pulse, minute, tempo.note_types_per_minute(), tempo.note_type(), type, pls, _frame_rate); + TempoSection* t = new TempoSection (pulse, minute, tempo, pls, _frame_rate); t->set_locked_to_meter (locked_to_meter); - bool solved = false; do_insert (t); if (recompute) { if (pls == AudioTime) { - solved = solve_map_minute (_metrics, t, t->minute()); + solve_map_minute (_metrics, t, t->minute()); } else { - solved = solve_map_pulse (_metrics, t, t->pulse()); + solve_map_pulse (_metrics, t, t->pulse()); } recompute_meters (_metrics); } - if (!solved && recompute) { - recompute_map (_metrics); - } - return t; } MeterSection* -TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, PositionLockStyle pls) +TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT_Time& where, framepos_t frame, PositionLockStyle pls) { MeterSection* m = 0; { Glib::Threads::RWLock::WriterLock lm (lock); - m = add_meter_locked (meter, beat, where, pls, true); + m = add_meter_locked (meter, beat, where, frame, pls, true); } #ifndef NDEBUG if (DEBUG_ENABLED(DEBUG::TempoMap)) { - dump (_metrics, std::cerr); + dump (std::cerr); } #endif @@ -1096,15 +1215,15 @@ TempoMap::add_meter (const Meter& meter, const double& beat, const Timecode::BBT } void -TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where, PositionLockStyle pls) +TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where, framepos_t frame, PositionLockStyle pls) { { Glib::Threads::RWLock::WriterLock lm (lock); const double beat = beat_at_bbt_locked (_metrics, where); - if (ms.movable()) { + if (!ms.initial()) { remove_meter_locked (ms); - add_meter_locked (meter, beat, where, pls, true); + add_meter_locked (meter, beat, where, frame, pls, true); } else { MeterSection& first (first_meter()); TempoSection& first_t (first_tempo()); @@ -1112,10 +1231,11 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T *static_cast(&first) = meter; first.set_position_lock_style (AudioTime); first.set_pulse (0.0); - //first.set_minute (minute_at_frame (frame)); + first.set_minute (minute_at_frame (frame)); pair beat = make_pair (0.0, BBT_Time (1, 1, 0)); first.set_beat (beat); first_t.set_minute (first.minute()); + first_t.set_locked_to_meter (true); first_t.set_pulse (0.0); first_t.set_position_lock_style (AudioTime); recompute_map (_metrics); @@ -1126,7 +1246,7 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T } MeterSection* -TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, PositionLockStyle pls, bool recompute) +TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& where, framepos_t frame, PositionLockStyle pls, bool recompute) { const MeterSection& prev_m = meter_section_at_minute_locked (_metrics, minute_at_beat_locked (_metrics, beat) - minute_at_frame (1)); const double pulse = ((where.bars - prev_m.bbt().bars) * (prev_m.divisions_per_bar() / prev_m.note_divisor())) + prev_m.pulse(); @@ -1135,7 +1255,7 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe if (pls == AudioTime) { /* add meter-locked tempo */ - mlt = add_tempo_locked (tempo_at_minute_locked (_metrics, time_minutes), pulse, time_minutes, TempoSection::Ramp, AudioTime, true, true); + mlt = add_tempo_locked (tempo_at_minute_locked (_metrics, time_minutes), pulse, minute_at_frame (frame), AudioTime, true, true); if (!mlt) { return 0; @@ -1143,7 +1263,8 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe } - MeterSection* new_meter = new MeterSection (pulse, time_minutes, beat, where, meter.divisions_per_bar(), meter.note_divisor(), pls, _frame_rate); + MeterSection* new_meter = new MeterSection (pulse, minute_at_frame (frame), beat, where, meter.divisions_per_bar(), meter.note_divisor(), pls, _frame_rate); + bool solved = false; do_insert (new_meter); @@ -1151,7 +1272,13 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe if (recompute) { if (pls == AudioTime) { - solved = solve_map_minute (_metrics, new_meter, time_minutes); + solved = solve_map_minute (_metrics, new_meter, minute_at_frame (frame)); + /* we failed, most likely due to some impossible frame requirement wrt audio-locked tempi. + fudge frame so that the meter ends up at its BBT position instead. + */ + if (!solved) { + solved = solve_map_minute (_metrics, new_meter, minute_at_frame (prev_m.frame() + 1)); + } } else { solved = solve_map_bbt (_metrics, new_meter, where); /* required due to resetting the pulse of meter-locked tempi above. @@ -1174,9 +1301,9 @@ TempoMap::add_meter_locked (const Meter& meter, double beat, const BBT_Time& whe } void -TempoMap::change_initial_tempo (double note_types_per_minute, double note_type) +TempoMap::change_initial_tempo (double note_types_per_minute, double note_type, double end_note_types_per_minute) { - Tempo newtempo (note_types_per_minute, note_type); + Tempo newtempo (note_types_per_minute, note_type, end_note_types_per_minute); TempoSection* t; for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { @@ -1196,9 +1323,9 @@ TempoMap::change_initial_tempo (double note_types_per_minute, double note_type) } void -TempoMap::change_existing_tempo_at (framepos_t where, double note_types_per_minute, double note_type) +TempoMap::change_existing_tempo_at (framepos_t where, double note_types_per_minute, double note_type, double end_ntpm) { - Tempo newtempo (note_types_per_minute, note_type); + Tempo newtempo (note_types_per_minute, note_type, end_ntpm); TempoSection* prev; TempoSection* first; @@ -1293,7 +1420,7 @@ TempoMap::first_tempo () const if (!t->active()) { continue; } - if (!t->movable()) { + if (t->initial()) { return *t; } } @@ -1314,7 +1441,7 @@ TempoMap::first_tempo () if (!t->active()) { continue; } - if (!t->movable()) { + if (t->initial()) { return *t; } } @@ -1337,7 +1464,7 @@ TempoMap::recompute_tempi (Metrics& metrics) if (!t->active()) { continue; } - if (!t->movable()) { + if (t->initial()) { if (!prev_t) { t->set_pulse (0.0); prev_t = t; @@ -1346,21 +1473,22 @@ TempoMap::recompute_tempi (Metrics& metrics) } if (prev_t) { if (t->position_lock_style() == AudioTime) { - prev_t->set_c_func (prev_t->compute_c_func_minute (t->note_types_per_minute(), t->minute())); + prev_t->set_c (prev_t->compute_c_minute (prev_t->end_note_types_per_minute(), t->minute())); if (!t->locked_to_meter()) { - t->set_pulse (prev_t->pulse_at_ntpm (t->note_types_per_minute(), t->minute())); + t->set_pulse (prev_t->pulse_at_ntpm (prev_t->end_note_types_per_minute(), t->minute())); } } else { - prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse())); - t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse())); + prev_t->set_c (prev_t->compute_c_pulse (prev_t->end_note_types_per_minute(), t->pulse())); + t->set_minute (prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse())); } } prev_t = t; } } - prev_t->set_c_func (0.0); + assert (prev_t); + prev_t->set_c (0.0); } /* tempos must be positioned correctly. @@ -1385,7 +1513,7 @@ TempoMap::recompute_meters (Metrics& metrics) TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || !t->movable()) && t->frame() == meter->frame()) { + if (t->locked_to_meter() && t->frame() == meter->frame()) { meter_locked_tempo = t; break; } @@ -1393,14 +1521,16 @@ TempoMap::recompute_meters (Metrics& metrics) } if (prev_m) { - const double beats = (meter->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar(); + 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 */ + + beats = meter->beat() - prev_m->beat(); 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()) { + } else if (!meter->initial()) { b_bbt = make_pair (meter->beat(), meter->bbt()); pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); } @@ -1597,12 +1727,18 @@ TempoMap::minute_at_beat_locked (const Metrics& metrics, const double& beat) con prev_m = m; } } + assert (prev_m); TempoSection* t; for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((*i)->is_tempo()) { t = static_cast (*i); + + if (!t->active()) { + continue; + } + if (prev_t && ((t->pulse() - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat() > beat) { break; } @@ -1610,6 +1746,7 @@ TempoMap::minute_at_beat_locked (const Metrics& metrics, const double& beat) con } } + assert (prev_t); return prev_t->minute_at_pulse (((beat - prev_m->beat()) / prev_m->note_divisor()) + prev_m->pulse()); } @@ -1648,7 +1785,7 @@ TempoMap::tempo_at_minute_locked (const Metrics& metrics, const double& minute) } } - return Tempo (prev_t->note_types_per_minute(), prev_t->note_type()); + return Tempo (prev_t->note_types_per_minute(), prev_t->note_type(), prev_t->end_note_types_per_minute()); } /** returns the frame at which the supplied tempo occurs, or @@ -1681,17 +1818,20 @@ TempoMap::minute_at_tempo_locked (const Metrics& metrics, const Tempo& tempo) co continue; } - const double t_bpm = t->note_types_per_minute(); - if (t_bpm == tempo_bpm) { + + if (t->note_types_per_minute() == tempo_bpm) { return t->minute(); } if (prev_t) { const double prev_t_bpm = prev_t->note_types_per_minute(); + const double prev_t_end_bpm = prev_t->end_note_types_per_minute(); + if ((prev_t_bpm > tempo_bpm && prev_t_end_bpm < tempo_bpm) + || (prev_t_bpm < tempo_bpm && prev_t_end_bpm > tempo_bpm) + || (prev_t_end_bpm == tempo_bpm)) { - if ((t_bpm > tempo_bpm && prev_t_bpm < tempo_bpm) || (t_bpm < tempo_bpm && prev_t_bpm > tempo_bpm)) { - return prev_t->minute_at_ntpm (prev_t->note_types_per_minute(), prev_t->pulse()); + return prev_t->minute_at_ntpm (tempo_bpm, t->pulse()); } } prev_t = t; @@ -1722,7 +1862,7 @@ TempoMap::tempo_at_pulse_locked (const Metrics& metrics, const double& pulse) co } } - return Tempo (prev_t->note_types_per_minute(), prev_t->note_type()); + return Tempo (prev_t->note_types_per_minute(), prev_t->note_type(), prev_t->end_note_types_per_minute()); } double @@ -1827,6 +1967,7 @@ TempoMap::beat_at_pulse_locked (const Metrics& metrics, const double& pulse) con prev_m = m; } } + assert (prev_m); double const ret = ((pulse - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat(); return ret; @@ -1973,6 +2114,7 @@ TempoMap::bbt_at_beat_locked (const Metrics& metrics, const double& b) const prev_m = m; } } + assert (prev_m); 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()); @@ -2110,6 +2252,8 @@ TempoMap::bbt_at_pulse_locked (const Metrics& metrics, const double& pulse) cons } } + assert (prev_m); + 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); @@ -2152,24 +2296,31 @@ TempoMap::bbt_at_frame (framepos_t frame) bbt.bars = 1; bbt.beats = 1; bbt.ticks = 0; +#ifndef NDEBUG warning << string_compose (_("tempo map was asked for BBT time at frame %1\n"), frame) << endmsg; +#endif return bbt; } + + const double minute = minute_at_frame (frame); + Glib::Threads::RWLock::ReaderLock lm (lock); - return bbt_at_minute_locked (_metrics, minute_at_frame (frame)); + return bbt_at_minute_locked (_metrics, minute); } BBT_Time TempoMap::bbt_at_frame_rt (framepos_t frame) { + const double minute = minute_at_frame (frame); + Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); if (!lm.locked()) { throw std::logic_error ("TempoMap::bbt_at_frame_rt() could not lock tempo map"); } - return bbt_at_minute_locked (_metrics, minute_at_frame (frame)); + return bbt_at_minute_locked (_metrics, minute); } Timecode::BBT_Time @@ -2251,16 +2402,23 @@ framepos_t TempoMap::frame_at_bbt (const BBT_Time& bbt) { if (bbt.bars < 1) { +#ifndef NDEBUG warning << string_compose (_("tempo map asked for frame time at bar < 1 (%1)\n"), bbt) << endmsg; +#endif return 0; } if (bbt.beats < 1) { throw std::logic_error ("beats are counted from one"); } - Glib::Threads::RWLock::ReaderLock lm (lock); - return frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); + double minute; + { + Glib::Threads::RWLock::ReaderLock lm (lock); + minute = minute_at_bbt_locked (_metrics, bbt); + } + + return frame_at_minute (minute); } /* meter & tempo section based */ @@ -2283,33 +2441,25 @@ TempoMap::minute_at_bbt_locked (const Metrics& metrics, const BBT_Time& bbt) con double TempoMap::quarter_note_at_frame (const framepos_t frame) const { - Glib::Threads::RWLock::ReaderLock lm (lock); - - const double ret = quarter_note_at_minute_locked (_metrics, minute_at_frame (frame)); - - return ret; -} + const double minute = minute_at_frame (frame); -double -TempoMap::quarter_note_at_minute_locked (const Metrics& metrics, const double minute) const -{ - const double ret = pulse_at_minute_locked (metrics, minute) * 4.0; + Glib::Threads::RWLock::ReaderLock lm (lock); - return ret; + return pulse_at_minute_locked (_metrics, minute) * 4.0; } double TempoMap::quarter_note_at_frame_rt (const framepos_t frame) const { + const double minute = minute_at_frame (frame); + Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); if (!lm.locked()) { throw std::logic_error ("TempoMap::quarter_note_at_frame_rt() could not lock tempo map"); } - const double ret = pulse_at_minute_locked (_metrics, minute_at_frame (frame)) * 4.0; - - return ret; + return pulse_at_minute_locked (_metrics, minute) * 4.0; } /** @@ -2323,19 +2473,14 @@ TempoMap::quarter_note_at_frame_rt (const framepos_t frame) const framepos_t TempoMap::frame_at_quarter_note (const double quarter_note) const { - Glib::Threads::RWLock::ReaderLock lm (lock); - - const framepos_t ret = frame_at_minute (minute_at_quarter_note_locked (_metrics, quarter_note)); - - return ret; -} + double minute; + { + Glib::Threads::RWLock::ReaderLock lm (lock); -double -TempoMap::minute_at_quarter_note_locked (const Metrics& metrics, const double quarter_note) const -{ - const double ret = minute_at_pulse_locked (metrics, quarter_note / 4.0); + minute = minute_at_pulse_locked (_metrics, quarter_note / 4.0); + } - return ret; + return frame_at_minute (minute); } /** Returns the quarter-note beats corresponding to the supplied BBT (meter-based) beat. @@ -2346,21 +2491,11 @@ TempoMap::minute_at_quarter_note_locked (const Metrics& metrics, const double qu * */ double -TempoMap::quarter_note_at_beat (const double beat) +TempoMap::quarter_note_at_beat (const double beat) const { Glib::Threads::RWLock::ReaderLock lm (lock); - const double ret = quarter_note_at_beat_locked (_metrics, beat); - - return ret; -} - -double -TempoMap::quarter_note_at_beat_locked (const Metrics& metrics, const double beat) const -{ - const double ret = pulse_at_beat_locked (metrics, beat) * 4.0; - - return ret; + return pulse_at_beat_locked (_metrics, beat) * 4.0; } /** Returns the BBT (meter-based) beat position corresponding to the supplied quarter-note beats. @@ -2371,20 +2506,11 @@ TempoMap::quarter_note_at_beat_locked (const Metrics& metrics, const double beat * */ double -TempoMap::beat_at_quarter_note (const double quarter_note) +TempoMap::beat_at_quarter_note (const double quarter_note) const { Glib::Threads::RWLock::ReaderLock lm (lock); - const double ret = beat_at_quarter_note_locked (_metrics, quarter_note); - - return ret; -} - -double -TempoMap::beat_at_quarter_note_locked (const Metrics& metrics, const double quarter_note) const -{ - - return beat_at_pulse_locked (metrics, quarter_note / 4.0); + return beat_at_pulse_locked (_metrics, quarter_note / 4.0); } /** Returns the duration in frames between two supplied quarter-note beat positions. @@ -2400,9 +2526,14 @@ TempoMap::beat_at_quarter_note_locked (const Metrics& metrics, const double quar framecnt_t TempoMap::frames_between_quarter_notes (const double start, const double end) const { - Glib::Threads::RWLock::ReaderLock lm (lock); + double minutes; + + { + Glib::Threads::RWLock::ReaderLock lm (lock); + minutes = minutes_between_quarter_notes_locked (_metrics, start, end); + } - return frame_at_minute (minutes_between_quarter_notes_locked (_metrics, start, end)); + return frame_at_minute (minutes); } double @@ -2439,6 +2570,7 @@ TempoMap::quarter_notes_between_frames_locked (const Metrics& metrics, const fra prev_t = t; } } + assert (prev_t); const double start_qn = prev_t->pulse_at_frame (start); for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { @@ -2481,7 +2613,7 @@ TempoMap::check_solved (const Metrics& metrics) const } /* precision check ensures tempo and frames align.*/ - if (t->frame() != frame_at_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse()))) { + if (t->frame() != frame_at_minute (prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse()))) { if (!t->locked_to_meter()) { return false; } @@ -2490,8 +2622,8 @@ TempoMap::check_solved (const Metrics& metrics) const /* gradient limit - who knows what it should be? things are also ok (if a little chaotic) without this */ - if (fabs (prev_t->c_func()) > 1000.0) { - //std::cout << "c : " << prev_t->c_func() << std::endl; + if (fabs (prev_t->c()) > 1000.0) { + //std::cout << "c : " << prev_t->c() << std::endl; return false; } } @@ -2502,10 +2634,10 @@ TempoMap::check_solved (const Metrics& metrics) const m = static_cast (*i); if (prev_m && m->position_lock_style() == AudioTime) { const TempoSection* t = &tempo_section_at_minute_locked (metrics, minute_at_frame (m->frame() - 1)); - const double nascent_m_minute = t->minute_at_pulse (m->pulse()); + const framepos_t nascent_m_frame = frame_at_minute (t->minute_at_pulse (m->pulse())); /* Here we check that a preceding section of music doesn't overlap a subsequent one. */ - if (t && (nascent_m_minute > m->minute() || nascent_m_minute < 0.0)) { + if (t && (nascent_m_frame > m->frame() || nascent_m_frame < 0)) { return false; } } @@ -2519,23 +2651,23 @@ TempoMap::check_solved (const Metrics& metrics) const } bool -TempoMap::set_active_tempos (const Metrics& metrics, const framepos_t& frame) +TempoMap::set_active_tempi (const Metrics& metrics, const framepos_t& frame) { for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { TempoSection* t; if ((*i)->is_tempo()) { t = static_cast (*i); - if (!t->movable()) { - t->set_active (true); - continue; - } - if (t->movable() && t->active () && t->position_lock_style() == AudioTime && t->frame() < frame) { - t->set_active (false); - t->set_pulse (0.0); - } else if (t->movable() && t->position_lock_style() == AudioTime && t->frame() > frame) { + if (t->locked_to_meter()) { t->set_active (true); - } else if (t->movable() && t->position_lock_style() == AudioTime && t->frame() == frame) { - return false; + } else if (t->position_lock_style() == AudioTime) { + if (t->frame() < frame) { + t->set_active (false); + t->set_pulse (-1.0); + } else if (t->frame() > frame) { + t->set_active (true); + } else if (t->frame() == frame) { + return false; + } } } } @@ -2548,19 +2680,20 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou TempoSection* prev_t = 0; TempoSection* section_prev = 0; double first_m_minute = 0.0; + const bool sml = section->locked_to_meter(); /* can't move a tempo before the first meter */ for (Metrics::iterator i = imaginary.begin(); i != imaginary.end(); ++i) { MeterSection* m; if (!(*i)->is_tempo()) { m = static_cast (*i); - if (!m->movable()) { + if (m->initial()) { first_m_minute = m->minute(); break; } } } - if (section->movable() && minute <= first_m_minute) { + if (!section->initial() && minute <= first_m_minute) { return false; } @@ -2575,21 +2708,36 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou if (!t->active()) { continue; } + if (prev_t) { + if (t == section) { + continue; + } + + if (t->frame() == frame_at_minute (minute)) { + return false; + } + + const bool tlm = t->position_lock_style() == MusicTime; + + if (prev_t && !section_prev && ((sml && tlm && t->pulse() > section->pulse()) || (!tlm && t->minute() > minute))) { section_prev = prev_t; - if (t->locked_to_meter()) { - prev_t = t; + + section_prev->set_c (section_prev->compute_c_minute (section_prev->end_note_types_per_minute(), minute)); + if (!section->locked_to_meter()) { + section->set_pulse (section_prev->pulse_at_ntpm (section_prev->end_note_types_per_minute(), minute)); } - continue; + prev_t = section; } + if (t->position_lock_style() == MusicTime) { - prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse())); - t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse())); + prev_t->set_c (prev_t->compute_c_pulse (prev_t->end_note_types_per_minute(), t->pulse())); + t->set_minute (prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse())); } else { - prev_t->set_c_func (prev_t->compute_c_func_minute (t->note_types_per_minute(), t->minute())); + prev_t->set_c (prev_t->compute_c_minute (prev_t->end_note_types_per_minute(), t->minute())); if (!t->locked_to_meter()) { - t->set_pulse (prev_t->pulse_at_ntpm (t->note_types_per_minute(), t->minute())); + t->set_pulse (prev_t->pulse_at_ntpm (prev_t->end_note_types_per_minute(), t->minute())); } } } @@ -2597,13 +2745,6 @@ TempoMap::solve_map_minute (Metrics& imaginary, TempoSection* section, const dou } } - if (section_prev) { - section_prev->set_c_func (section_prev->compute_c_func_minute (section->note_types_per_minute(), minute)); - if (!section->locked_to_meter()) { - section->set_pulse (section_prev->pulse_at_ntpm (section->note_types_per_minute(), minute)); - } - } - #if (0) recompute_tempi (imaginary); @@ -2641,7 +2782,7 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub if (!t->active()) { continue; } - if (!t->movable()) { + if (t->initial()) { t->set_pulse (0.0); prev_t = t; continue; @@ -2651,13 +2792,14 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub section_prev = prev_t; continue; } + if (t->position_lock_style() == MusicTime) { - prev_t->set_c_func (prev_t->compute_c_func_pulse (t->note_types_per_minute(), t->pulse())); - t->set_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse())); + prev_t->set_c (prev_t->compute_c_pulse (prev_t->end_note_types_per_minute(), t->pulse())); + t->set_minute (prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse())); } else { - prev_t->set_c_func (prev_t->compute_c_func_minute (t->note_types_per_minute(), t->minute())); + prev_t->set_c (prev_t->compute_c_minute (prev_t->end_note_types_per_minute(), t->minute())); if (!t->locked_to_meter()) { - t->set_pulse (prev_t->pulse_at_ntpm (t->note_types_per_minute(), t->minute())); + t->set_pulse (prev_t->pulse_at_ntpm (prev_t->end_note_types_per_minute(), t->minute())); } } } @@ -2666,8 +2808,8 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub } if (section_prev) { - section_prev->set_c_func (section_prev->compute_c_func_pulse (section->note_types_per_minute(), pulse)); - section->set_minute (section_prev->minute_at_ntpm (section->note_types_per_minute(), pulse)); + section_prev->set_c (section_prev->compute_c_pulse (section_prev->end_note_types_per_minute(), pulse)); + section->set_minute (section_prev->minute_at_ntpm (section_prev->end_note_types_per_minute(), pulse)); } #if (0) @@ -2704,15 +2846,15 @@ TempoMap::solve_map_pulse (Metrics& imaginary, TempoSection* section, const doub bool TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const double& minute) { - /* disallow moving first meter past any subsequent one, and any movable meter before the first one */ + /* disallow moving first meter past any subsequent one, and any initial meter before the first one */ const MeterSection* other = &meter_section_at_minute_locked (imaginary, minute); - if ((!section->movable() && other->movable()) || (!other->movable() && section->movable() && other->minute() >= minute)) { + if ((section->initial() && !other->initial()) || (other->initial() && !section->initial() && other->minute() >= minute)) { return false; } - if (!section->movable()) { + if (section->initial()) { /* lock the first tempo to our first meter */ - if (!set_active_tempos (imaginary, section->frame_at_minute (minute))) { + if (!set_active_tempi (imaginary, frame_at_minute (minute))) { return false; } } @@ -2723,7 +2865,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || !t->movable()) && t->minute() == section->minute()) { + if (t->locked_to_meter() && t->frame() == section->frame()) { meter_locked_tempo = t; break; } @@ -2744,7 +2886,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou if (!(*i)->is_tempo()) { m = static_cast (*i); if (m == section){ - if (prev_m && section->movable()) { + if (prev_m && !section->initial()) { const double beats = (pulse_at_minute_locked (imaginary, minute) - prev_m->pulse()) * prev_m->note_divisor(); if (beats + prev_m->beat() < section->beat()) { /* set the section pulse according to its musical position, @@ -2778,7 +2920,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou } } else { /* all is ok. set section's locked tempo if allowed. - possibly disallowed if there is an adjacent audio-locked tempo. + possibly disallow if there is an adjacent audio-locked tempo. XX this check could possibly go. its never actually happened here. */ MeterSection* meter_copy = const_cast @@ -2806,7 +2948,7 @@ TempoMap::solve_map_minute (Metrics& imaginary, MeterSection* section, const dou } } } else { - /* not movable (first meter atm) */ + /* initial (first meter atm) */ tempo_copy->set_minute (minute); tempo_copy->set_pulse (0.0); @@ -2871,11 +3013,17 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti MeterSection* m; if (!(*i)->is_tempo()) { m = static_cast (*i); + + if (m == section) { + continue; + } + 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); @@ -2884,7 +3032,6 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti section->set_pulse (pulse); section->set_minute (minute_at_pulse_locked (imaginary, pulse)); prev_m = section; - continue; } if (m->position_lock_style() == AudioTime) { @@ -2894,7 +3041,7 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti TempoSection* t; if ((*ii)->is_tempo()) { t = static_cast (*ii); - if ((t->locked_to_meter() || !t->movable()) && t->frame() == m->frame()) { + if (t->locked_to_meter() && t->frame() == m->frame()) { meter_locked_tempo = t; break; } @@ -2906,14 +3053,21 @@ TempoMap::solve_map_bbt (Metrics& imaginary, MeterSection* section, const BBT_Ti } if (prev_m) { - const double beats = ((m->bbt().bars - prev_m->bbt().bars) * prev_m->divisions_per_bar()); + 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). */ + + /* the user has requested that the previous section of music overlaps this one. + we have no choice but to change the bar number here, as being locked to audio means + we must stay where we are on the timeline. + */ + beats = m->beat() - prev_m->beat(); 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()) { + + } else if (!m->initial()) { b_bbt = make_pair (m->beat(), m->bbt()); new_pulse = prev_m->pulse() + (beats / prev_m->note_divisor()); } @@ -3077,6 +3231,10 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt) const double beat = beat_at_bbt_locked (future_map, bbt); + if (section->position_lock_style() == AudioTime) { + tempo_copy->set_position_lock_style (MusicTime); + } + if (solve_map_pulse (future_map, tempo_copy, pulse_at_beat_locked (future_map, beat))) { ret.first = tempo_copy->pulse(); ret.second = tempo_copy->frame(); @@ -3110,7 +3268,7 @@ TempoMap::predict_tempo_position (TempoSection* section, const BBT_Time& bbt) * if sub_num is zero, the musical position will be taken from the supplied frame. */ void -TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& sub_num) +TempoMap::gui_set_tempo_position (TempoSection* ts, const framepos_t& frame, const int& sub_num) { Metrics future_map; @@ -3145,20 +3303,16 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& * Placing the ts at the beat corresponding to the requested frame may shift the * grid in such a way that the mouse is left hovering over a completerly different division, * causing jittering when the mouse next moves (esp. large tempo deltas). - * To avoid this, place the ts at the requested frame in a dummy map - * then find the closest beat subdivision to that frame in the dummy. + * * This alters the snap behaviour slightly in that we snap to beat divisions * in the future map rather than the existing one. */ - const double beat = exact_beat_at_frame_locked (future_map, frame, sub_num); - const double pulse = pulse_at_beat_locked (future_map, beat); - - if (solve_map_pulse (future_map, tempo_copy, pulse)) { - /* snapping to a grid. force MusicTime temporarily. */ - ts->set_position_lock_style (MusicTime); - solve_map_pulse (_metrics, ts, pulse); - ts->set_position_lock_style (AudioTime); + const double qn = exact_qn_at_frame_locked (future_map, frame, sub_num); + const framepos_t snapped_frame = frame_at_minute (minute_at_pulse_locked (future_map, qn / 4.0)); + if (solve_map_minute (future_map, tempo_copy, minute_at_frame (snapped_frame))) { + solve_map_minute (_metrics, ts, minute_at_frame (snapped_frame)); + ts->set_pulse (qn / 4.0); recompute_meters (_metrics); } } else { @@ -3175,7 +3329,7 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& ++d; } - MetricPositionChanged (); // Emit Signal + MetricPositionChanged (PropertyChange ()); // Emit Signal } /** moves a MeterSection to a specified position. @@ -3187,7 +3341,7 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& * leaving the meter position unchanged. */ void -TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) +TempoMap::gui_set_meter_position (MeterSection* ms, const framepos_t& frame) { Metrics future_map; @@ -3223,22 +3377,39 @@ TempoMap::gui_move_meter (MeterSection* ms, const framepos_t& frame) ++d; } - MetricPositionChanged (); // Emit Signal + MetricPositionChanged (PropertyChange ()); // Emit Signal } bool -TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) +TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm, bool change_end) { 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_note_types_per_minute (bpm.note_types_per_minute()); + + if (change_end && tempo_copy->type() == TempoSection::Constant) { + tempo_copy->set_end_note_types_per_minute (bpm.note_types_per_minute()); + tempo_copy->set_note_types_per_minute (bpm.note_types_per_minute()); + } else if (change_end) { + tempo_copy->set_end_note_types_per_minute (bpm.note_types_per_minute()); + } else { + tempo_copy->set_note_types_per_minute (bpm.note_types_per_minute()); + } + recompute_tempi (future_map); if (check_solved (future_map)) { - ts->set_note_types_per_minute (bpm.note_types_per_minute()); + if (change_end && ts->type() == TempoSection::Constant) { + ts->set_end_note_types_per_minute (bpm.note_types_per_minute()); + ts->set_note_types_per_minute (bpm.note_types_per_minute()); + } else if (change_end) { + ts->set_end_note_types_per_minute (bpm.note_types_per_minute()); + } else { + ts->set_note_types_per_minute (bpm.note_types_per_minute()); + } + recompute_map (_metrics); can_solve = true; } @@ -3250,13 +3421,14 @@ TempoMap::gui_change_tempo (TempoSection* ts, const Tempo& bpm) ++d; } if (can_solve) { - MetricPositionChanged (); // Emit Signal + MetricPositionChanged (PropertyChange ()); // Emit Signal } + return can_solve; } void -TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const framepos_t& end_frame) +TempoMap::gui_stretch_tempo (TempoSection* ts, const framepos_t frame, const framepos_t end_frame) { /* Ts (future prev_t) Tnext @@ -3276,103 +3448,224 @@ TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const fra } 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; - if (prev_t && prev_t->pulse() > 0.0) { - prev_to_prev_t = const_cast(&tempo_section_at_minute_locked (future_map, minute_at_frame (prev_t->frame() - 1))); + if (!prev_t) { + return; } - TempoSection* next_t = 0; - for (Metrics::iterator i = future_map.begin(); i != future_map.end(); ++i) { - TempoSection* t = 0; - if ((*i)->is_tempo()) { - t = static_cast (*i); - if (t->frame() > ts->frame()) { - next_t = t; - break; - } - } - } /* minimum allowed measurement distance in frames */ - const framepos_t min_dframe = 2; + framepos_t const min_dframe = 2; - /* 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; + double new_bpm; - if (next_t && prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { - contribution = (prev_t->frame() - prev_to_prev_t->frame()) / (double) (next_t->frame() - prev_to_prev_t->frame()); + if (frame > prev_t->frame() + min_dframe && end_frame > prev_t->frame() + min_dframe) { + + new_bpm = prev_t->note_types_per_minute() * ((frame - prev_t->frame()) + / (double) (end_frame - prev_t->frame())); + } else { + new_bpm = prev_t->note_types_per_minute(); } - const frameoffset_t prev_t_frame_contribution = fr_off - (contribution * (double) fr_off); + std::cout << "new bpm : " << new_bpm << std::endl; + new_bpm = min (new_bpm, (double) 1000.0); - const double start_pulse = prev_t->pulse_at_minute (minute_at_frame (frame)); - const double end_pulse = prev_t->pulse_at_minute (minute_at_frame (end_frame)); + /* don't clamp and proceed here. + testing has revealed that this can go negative, + which is an entirely different thing to just being too low. + */ - double new_bpm; + if (new_bpm < 0.5) { + goto out; + } - if (prev_t->type() == TempoSection::Constant || prev_t->c_func() == 0.0) { + if (prev_t && prev_t->type() == TempoSection::Ramp) { + prev_t->set_note_types_per_minute (new_bpm); + } else { + prev_t->set_end_note_types_per_minute (new_bpm); + prev_t->set_note_types_per_minute (new_bpm); + } - if (prev_t->position_lock_style() == MusicTime) { - if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { - if (frame > prev_to_prev_t->frame() + min_dframe && (frame + prev_t_frame_contribution) > prev_to_prev_t->frame() + min_dframe) { + recompute_tempi (future_map); + recompute_meters (future_map); - new_bpm = prev_t->note_types_per_minute() * ((frame - prev_to_prev_t->frame()) - / (double) ((frame + prev_t_frame_contribution) - prev_to_prev_t->frame())); - } else { - new_bpm = prev_t->note_types_per_minute(); - } - } else { - /* prev to prev is irrelevant */ - - if (start_pulse > prev_t->pulse() && end_pulse > prev_t->pulse()) { - new_bpm = prev_t->note_types_per_minute() * ((start_pulse - prev_t->pulse()) / (end_pulse - prev_t->pulse())); - } else { - new_bpm = prev_t->note_types_per_minute(); - } - } + if (check_solved (future_map)) { + if (prev_t && prev_t->type() == TempoSection::Ramp) { + ts->set_note_types_per_minute (new_bpm); } else { - /* AudioTime */ - if (prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { - if (frame > prev_to_prev_t->frame() + min_dframe && end_frame > prev_to_prev_t->frame() + min_dframe) { + ts->set_end_note_types_per_minute (new_bpm); + ts->set_note_types_per_minute (new_bpm); + } + recompute_tempi (_metrics); + recompute_meters (_metrics); + } + } - new_bpm = prev_t->note_types_per_minute() * ((frame - prev_to_prev_t->frame()) - / (double) ((end_frame) - prev_to_prev_t->frame())); - } else { - new_bpm = prev_t->note_types_per_minute(); - } - } else { - /* prev_to_prev_t is irrelevant */ + MetricPositionChanged (PropertyChange ()); // Emit Signal - if (frame > prev_t->frame() + min_dframe && end_frame > prev_t->frame() + min_dframe) { - new_bpm = prev_t->note_types_per_minute() * ((frame - prev_t->frame()) / (double) (end_frame - prev_t->frame())); - } else { - new_bpm = prev_t->note_types_per_minute(); - } - } +out: + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + +} +void +TempoMap::gui_stretch_tempo_end (TempoSection* ts, const framepos_t frame, const framepos_t end_frame) +{ + /* + Ts (future prev_t) Tnext + | | + | [drag^] | + |----------|---------- + e_f qn_beats(frame) + */ + + Metrics future_map; + + { + Glib::Threads::RWLock::WriterLock lm (lock); + + if (!ts) { + return; + } + + TempoSection* prev_t = copy_metrics_and_point (_metrics, future_map, ts); + +/* + TempoSection* next_t = 0; + for (Metrics::const_iterator i = future_map.begin(); i != future_map.end(); ++i) { + if ((*i)->is_tempo() && (*i)->minute() > prev_t->minute()) { + next_t = static_cast (*i); + break; } + } + + if (!next_t) { + return; + } +*/ + if (!prev_t) { + return; + } + + + /* minimum allowed measurement distance in frames */ + framepos_t const min_dframe = 2; + double new_bpm; + + if (frame > prev_t->frame() + min_dframe && end_frame > prev_t->frame() + min_dframe) { + new_bpm = prev_t->end_note_types_per_minute() * ((frame - prev_t->frame()) + / (double) (end_frame - prev_t->frame())); } else { + new_bpm = prev_t->end_note_types_per_minute(); + } - double frame_ratio = 1.0; - double pulse_ratio = 1.0; - const double pulse_pos = frame; + new_bpm = min (new_bpm, (double) 1000.0); - if (prev_to_prev_t) { - if (pulse_pos > prev_to_prev_t->frame() + min_dframe && (pulse_pos - fr_off) > prev_to_prev_t->frame() + min_dframe) { - frame_ratio = (((pulse_pos - fr_off) - prev_to_prev_t->frame()) / (double) ((pulse_pos) - prev_to_prev_t->frame())); - } - if (end_pulse > prev_to_prev_t->pulse() && start_pulse > prev_to_prev_t->pulse()) { - pulse_ratio = ((start_pulse - prev_to_prev_t->pulse()) / (end_pulse - prev_to_prev_t->pulse())); - } - } else { - if (pulse_pos > prev_t->frame() + min_dframe && (pulse_pos - fr_off) > prev_t->frame() + min_dframe) { - frame_ratio = (((pulse_pos - fr_off) - prev_t->frame()) / (double) ((pulse_pos) - prev_t->frame())); - } - pulse_ratio = (start_pulse / end_pulse); + if (new_bpm < 0.5) { + goto out; + } + + prev_t->set_end_note_types_per_minute (new_bpm); + + recompute_tempi (future_map); + recompute_meters (future_map); + + if (check_solved (future_map)) { + ts->set_end_note_types_per_minute (new_bpm); + + recompute_tempi (_metrics); + recompute_meters (_metrics); + } + } + + MetricPositionChanged (PropertyChange ()); // Emit Signal + +out: + Metrics::const_iterator d = future_map.begin(); + while (d != future_map.end()) { + delete (*d); + ++d; + } + +} +bool +TempoMap::gui_twist_tempi (TempoSection* ts, const Tempo& bpm, const framepos_t frame, const framepos_t end_frame) +{ + TempoSection* next_t = 0; + TempoSection* next_to_next_t = 0; + Metrics future_map; + bool can_solve = false; + + /* minimum allowed measurement distance in frames */ + framepos_t const min_dframe = 2; + + { + Glib::Threads::RWLock::WriterLock lm (lock); + if (!ts) { + return false; + } + + TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts); + TempoSection* prev_to_prev_t = 0; + const frameoffset_t fr_off = end_frame - frame; + + if (!tempo_copy) { + return false; + } + + if (tempo_copy->pulse() > 0.0) { + prev_to_prev_t = const_cast(&tempo_section_at_minute_locked (future_map, minute_at_frame (tempo_copy->frame() - 1))); + } + + for (Metrics::const_iterator i = future_map.begin(); i != future_map.end(); ++i) { + if ((*i)->is_tempo() && (*i)->minute() > tempo_copy->minute()) { + next_t = static_cast (*i); + break; + } + } + + if (!next_t) { + return false; + } + + for (Metrics::const_iterator i = future_map.begin(); i != future_map.end(); ++i) { + if ((*i)->is_tempo() && (*i)->minute() > next_t->minute()) { + next_to_next_t = static_cast (*i); + break; } - new_bpm = prev_t->note_types_per_minute() * (pulse_ratio * frame_ratio); + } + + if (!next_to_next_t) { + std::cout << "no next to next t" << std::endl; + return false; + } + + double prev_contribution = 0.0; + + if (next_t && prev_to_prev_t && prev_to_prev_t->type() == TempoSection::Ramp) { + prev_contribution = (tempo_copy->frame() - prev_to_prev_t->frame()) / (double) (next_t->frame() - prev_to_prev_t->frame()); + } + + const frameoffset_t tempo_copy_frame_contribution = fr_off - (prev_contribution * (double) fr_off); + + + framepos_t old_tc_pos = tempo_copy->frame(); + framepos_t old_next_pos = next_t->frame(); + double old_next_minute = next_t->minute(); + framepos_t old_next_to_next_pos = next_to_next_t->frame(); + double old_next_to_next_minute = next_to_next_t->minute(); + + double new_bpm; + double new_next_bpm; + double new_copy_end_bpm; + + if (frame > prev_to_prev_t->frame() + min_dframe && (frame + tempo_copy_frame_contribution) > prev_to_prev_t->frame() + min_dframe) { + new_bpm = tempo_copy->note_types_per_minute() * ((frame - tempo_copy->frame()) + / (double) (end_frame - tempo_copy->frame())); + } else { + new_bpm = tempo_copy->note_types_per_minute(); } /* don't clamp and proceed here. @@ -3380,17 +3673,95 @@ TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const fra which is an entirely different thing to just being too low. */ if (new_bpm < 0.5) { - return; + return false; } + new_bpm = min (new_bpm, (double) 1000.0); - prev_t->set_note_types_per_minute (new_bpm); + + tempo_copy->set_note_types_per_minute (new_bpm); + if (tempo_copy->type() == TempoSection::Constant) { + tempo_copy->set_end_note_types_per_minute (new_bpm); + } recompute_tempi (future_map); - recompute_meters (future_map); if (check_solved (future_map)) { + + if (!next_t) { + return false; + } ts->set_note_types_per_minute (new_bpm); - recompute_tempi (_metrics); - recompute_meters (_metrics); + if (ts->type() == TempoSection::Constant) { + ts->set_end_note_types_per_minute (new_bpm); + } + recompute_map (_metrics); + can_solve = true; + } + + if (next_t->type() == TempoSection::Constant || next_t->c() == 0.0) { + if (frame > prev_to_prev_t->frame() + min_dframe && end_frame > prev_to_prev_t->frame() + min_dframe) { + + new_next_bpm = next_t->note_types_per_minute() * ((next_to_next_t->minute() - old_next_minute) + / (double) ((old_next_to_next_minute) - old_next_minute)); + + } else { + new_next_bpm = next_t->note_types_per_minute(); + } + + next_t->set_note_types_per_minute (new_next_bpm); + recompute_tempi (future_map); + + if (check_solved (future_map)) { + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + if ((*i)->is_tempo() && (*i)->minute() > ts->minute()) { + next_t = static_cast (*i); + break; + } + } + + if (!next_t) { + return false; + } + next_t->set_note_types_per_minute (new_next_bpm); + recompute_map (_metrics); + can_solve = true; + } + } else { + double next_frame_ratio = 1.0; + double copy_frame_ratio = 1.0; + + if (next_to_next_t) { + next_frame_ratio = (next_to_next_t->frame() - old_next_pos) / (double) (old_next_to_next_pos - old_next_pos); + + copy_frame_ratio = ((old_tc_pos - next_t->frame()) / (double) (old_tc_pos - old_next_pos)); + + } else { + //next_frame_ratio = (((next_to_next_pos - fr_off) - next_t->frame()) / (double) ((next_to_next_pos) - next_t->frame())); + //next_pulse_ratio = (start_pulse / end_pulse); + } + + new_next_bpm = next_t->note_types_per_minute() * next_frame_ratio; + new_copy_end_bpm = tempo_copy->end_note_types_per_minute() * copy_frame_ratio; + + next_t->set_note_types_per_minute (new_next_bpm); + tempo_copy->set_end_note_types_per_minute (new_copy_end_bpm); + recompute_tempi (future_map); + + if (check_solved (future_map)) { + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + if ((*i)->is_tempo() && (*i)->minute() > ts->minute()) { + next_t = static_cast (*i); + break; + } + } + + if (!next_t) { + return false; + } + next_t->set_note_types_per_minute (new_next_bpm); + ts->set_end_note_types_per_minute (new_copy_end_bpm); + recompute_map (_metrics); + can_solve = true; + } } } @@ -3399,10 +3770,12 @@ TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const fra delete (*d); ++d; } + if (can_solve) { + MetricPositionChanged (PropertyChange ()); // Emit Signal + } - MetricPositionChanged (); // Emit Signal + return can_solve; } - /** Returns the exact bbt-based beat corresponding to the bar, beat or quarter note subdivision nearest to * the supplied frame, possibly returning a negative value. * @@ -3426,7 +3799,7 @@ TempoMap::gui_dilate_tempo (TempoSection* ts, const framepos_t& frame, const fra * This function is sensitive to tempo and meter. */ double -TempoMap::exact_beat_at_frame (const framepos_t& frame, const int32_t sub_num) +TempoMap::exact_beat_at_frame (const framepos_t& frame, const int32_t sub_num) const { Glib::Threads::RWLock::ReaderLock lm (lock); @@ -3434,7 +3807,7 @@ TempoMap::exact_beat_at_frame (const framepos_t& frame, const int32_t sub_num) } double -TempoMap::exact_beat_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t divisions) +TempoMap::exact_beat_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t divisions) const { return beat_at_pulse_locked (_metrics, exact_qn_at_frame_locked (metrics, frame, divisions) / 4.0); } @@ -3462,7 +3835,7 @@ TempoMap::exact_beat_at_frame_locked (const Metrics& metrics, const framepos_t& * This function is tempo-sensitive. */ double -TempoMap::exact_qn_at_frame (const framepos_t& frame, const int32_t sub_num) +TempoMap::exact_qn_at_frame (const framepos_t& frame, const int32_t sub_num) const { Glib::Threads::RWLock::ReaderLock lm (lock); @@ -3470,15 +3843,15 @@ TempoMap::exact_qn_at_frame (const framepos_t& frame, const int32_t sub_num) } double -TempoMap::exact_qn_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t sub_num) +TempoMap::exact_qn_at_frame_locked (const Metrics& metrics, const framepos_t& frame, const int32_t sub_num) const { - double qn = quarter_note_at_minute_locked (metrics, minute_at_frame (frame)); + double qn = pulse_at_minute_locked (metrics, minute_at_frame (frame)) * 4.0; if (sub_num > 1) { qn = floor (qn) + (floor (((qn - floor (qn)) * (double) sub_num) + 0.5) / sub_num); } else if (sub_num == 1) { /* the gui requested exact musical (BBT) beat */ - qn = quarter_note_at_beat_locked (metrics, floor (beat_at_minute_locked (metrics, minute_at_frame (frame)) + 0.5)); + qn = pulse_at_beat_locked (metrics, (floor (beat_at_minute_locked (metrics, minute_at_frame (frame)) + 0.5))) * 4.0; } else if (sub_num == -1) { /* snap to bar */ Timecode::BBT_Time bbt = bbt_at_pulse_locked (metrics, qn / 4.0); @@ -3511,7 +3884,7 @@ TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) Glib::Threads::RWLock::ReaderLock lm (lock); BBT_Time pos_bbt = bbt_at_minute_locked (_metrics, minute_at_frame (pos)); - const framecnt_t offset = frame_at_minute (minute_at_bbt_locked (_metrics, pos_bbt)); + const double divisions = meter_section_at_minute_locked (_metrics, minute_at_frame (pos)).divisions_per_bar(); if (dir > 0) { @@ -3528,149 +3901,69 @@ TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) pos_bbt.bars += 1; pos_bbt.beats -= divisions; } + const framecnt_t pos_bbt_frame = frame_at_minute (minute_at_bbt_locked (_metrics, pos_bbt)); + + return pos_bbt_frame - pos; - return frame_at_minute (minute_at_bbt_locked (_metrics, pos_bbt)) - offset; } else { - pos_bbt.bars -= bbt.bars; + + if (pos_bbt.bars <= bbt.bars) { + pos_bbt.bars = 1; + } else { + pos_bbt.bars -= bbt.bars; + } if (pos_bbt.ticks < bbt.ticks) { - if (pos_bbt.beats == 1) { - pos_bbt.bars--; - pos_bbt.beats = divisions; + if (pos_bbt.bars > 1) { + if (pos_bbt.beats == 1) { + pos_bbt.bars--; + pos_bbt.beats = divisions; + } else { + pos_bbt.beats--; + } + pos_bbt.ticks = BBT_Time::ticks_per_beat - (bbt.ticks - pos_bbt.ticks); } else { - pos_bbt.beats--; + pos_bbt.beats = 1; + pos_bbt.ticks = 0; } - pos_bbt.ticks = BBT_Time::ticks_per_beat - (bbt.ticks - pos_bbt.ticks); } else { pos_bbt.ticks -= bbt.ticks; } if (pos_bbt.beats <= bbt.beats) { - pos_bbt.bars--; - pos_bbt.beats = divisions - (bbt.beats - pos_bbt.beats); + if (pos_bbt.bars > 1) { + pos_bbt.bars--; + pos_bbt.beats = divisions - (bbt.beats - pos_bbt.beats); + } else { + pos_bbt.beats = 1; + } } else { pos_bbt.beats -= bbt.beats; } - return offset - frame_at_minute (minute_at_bbt_locked (_metrics, pos_bbt)); + return pos - frame_at_minute (minute_at_bbt_locked (_metrics, pos_bbt)); } return 0; } -framepos_t +MusicFrame TempoMap::round_to_bar (framepos_t fr, RoundMode dir) { return round_to_type (fr, dir, Bar); } -framepos_t +MusicFrame TempoMap::round_to_beat (framepos_t fr, RoundMode dir) { return round_to_type (fr, dir, Beat); } -framepos_t -TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir) -{ - Glib::Threads::RWLock::ReaderLock lm (lock); - uint32_t ticks = (uint32_t) floor (max (0.0, beat_at_minute_locked (_metrics, minute_at_frame (fr))) * BBT_Time::ticks_per_beat); - uint32_t beats = (uint32_t) floor (ticks / BBT_Time::ticks_per_beat); - uint32_t ticks_one_subdivisions_worth = (uint32_t) BBT_Time::ticks_per_beat / sub_num; - - ticks -= beats * BBT_Time::ticks_per_beat; - - if (dir > 0) { - /* round to next (or same iff dir == RoundUpMaybe) */ - - uint32_t mod = 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 */ - ticks += ticks_one_subdivisions_worth; - - } else { - /* not on subdivision, compute distance to next subdivision */ - - ticks += ticks_one_subdivisions_worth - mod; - } - - if (ticks >= BBT_Time::ticks_per_beat) { - ticks -= BBT_Time::ticks_per_beat; - } - } else if (dir < 0) { - - /* round to previous (or same iff dir == RoundDownMaybe) */ - - uint32_t difference = 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 (ticks < difference) { - ticks = BBT_Time::ticks_per_beat - ticks; - } else { - ticks -= difference; - } - - } else { - /* round to nearest */ - double rem; - - /* compute the distance to the previous and next subdivision */ - - if ((rem = fmod ((double) ticks, (double) ticks_one_subdivisions_worth)) > ticks_one_subdivisions_worth/2.0) { - - /* closer to the next subdivision, so shift forward */ - - ticks = lrint (ticks + (ticks_one_subdivisions_worth - rem)); - - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("moved forward to %1\n", ticks)); - - if (ticks > BBT_Time::ticks_per_beat) { - ++beats; - ticks -= BBT_Time::ticks_per_beat; - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("fold beat to %1\n", beats)); - } - - } else if (rem > 0) { - - /* closer to previous subdivision, so shift backward */ - - if (rem > ticks) { - if (beats == 0) { - /* can't go backwards past zero, so ... */ - return 0; - } - /* step back to previous beat */ - --beats; - ticks = lrint (BBT_Time::ticks_per_beat - rem); - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("step back beat to %1\n", beats)); - } else { - ticks = lrint (ticks - rem); - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("moved backward to %1\n", ticks)); - } - } else { - /* on the subdivision, do nothing */ - } - } - - const framepos_t ret_frame = frame_at_minute (minute_at_beat_locked (_metrics, beats + (ticks / BBT_Time::ticks_per_beat))); - - return ret_frame; -} - -framepos_t +MusicFrame TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMode dir) { Glib::Threads::RWLock::ReaderLock lm (lock); - uint32_t ticks = (uint32_t) floor (max (0.0, quarter_note_at_minute_locked (_metrics, minute_at_frame (fr))) * BBT_Time::ticks_per_beat); + uint32_t ticks = (uint32_t) floor (max (0.0, pulse_at_minute_locked (_metrics, minute_at_frame (fr))) * BBT_Time::ticks_per_beat * 4.0); uint32_t beats = (uint32_t) floor (ticks / BBT_Time::ticks_per_beat); uint32_t ticks_one_subdivisions_worth = (uint32_t) BBT_Time::ticks_per_beat / sub_num; @@ -3694,9 +3987,14 @@ TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMo ticks += ticks_one_subdivisions_worth - mod; } - if (ticks >= BBT_Time::ticks_per_beat) { - ticks -= BBT_Time::ticks_per_beat; - } +//NOTE: this code intentionally limits the rounding so we don't advance to the next beat. +// For the purposes of "jump-to-next-subdivision", we DO want to advance to the next beat. +// And since the "prev" direction DOES move beats, I assume this code is unintended. +// But I'm keeping it around, until we determine there are no terrible consequences. +// if (ticks >= BBT_Time::ticks_per_beat) { +// ticks -= BBT_Time::ticks_per_beat; +// } + } else if (dir < 0) { /* round to previous (or same iff dir == RoundDownMaybe) */ @@ -3742,7 +4040,7 @@ TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMo if (rem > ticks) { if (beats == 0) { /* can't go backwards past zero, so ... */ - return 0; + return MusicFrame (0, 0); } /* step back to previous beat */ --beats; @@ -3757,33 +4055,46 @@ TempoMap::round_to_quarter_note_subdivision (framepos_t fr, int sub_num, RoundMo } } - const framepos_t ret_frame = frame_at_minute (minute_at_quarter_note_locked (_metrics, beats + (ticks / BBT_Time::ticks_per_beat))); + MusicFrame ret (0, 0); + ret.frame = frame_at_minute (minute_at_pulse_locked (_metrics, (beats + (ticks / BBT_Time::ticks_per_beat)) / 4.0)); + ret.division = sub_num; - return ret_frame; + return ret; } -framepos_t +MusicFrame TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) { Glib::Threads::RWLock::ReaderLock lm (lock); - - const double beat_at_framepos = max (0.0, beat_at_minute_locked (_metrics, minute_at_frame (frame))); + const double minute = minute_at_frame (frame); + const double beat_at_framepos = max (0.0, beat_at_minute_locked (_metrics, minute)); BBT_Time bbt (bbt_at_beat_locked (_metrics, beat_at_framepos)); + MusicFrame ret (0, 0); switch (type) { case Bar: + ret.division = -1; + if (dir < 0) { /* find bar previous to 'frame' */ + if (bbt.bars > 0) + --bbt.bars; bbt.beats = 1; bbt.ticks = 0; - return frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); + + ret.frame = frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); + + return ret; } else if (dir > 0) { /* find bar following 'frame' */ ++bbt.bars; bbt.beats = 1; bbt.ticks = 0; - return frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); + + ret.frame = frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); + + return ret; } else { /* true rounding: find nearest bar */ framepos_t raw_ft = frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); @@ -3793,27 +4104,40 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) ++bbt.bars; framepos_t next_ft = frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); - if ((raw_ft - prev_ft) > (next_ft - prev_ft) / 2) { - return next_ft; + if ((raw_ft - prev_ft) > (next_ft - prev_ft) / 2) { + ret.frame = next_ft; + + return ret; } else { - return prev_ft; + --bbt.bars; + ret.frame = prev_ft; + + return ret; } } break; case Beat: + ret.division = 1; + if (dir < 0) { - return frame_at_minute (minute_at_beat_locked (_metrics, floor (beat_at_framepos))); + ret.frame = frame_at_minute (minute_at_beat_locked (_metrics, floor (beat_at_framepos))); + + return ret; } else if (dir > 0) { - return frame_at_minute (minute_at_beat_locked (_metrics, ceil (beat_at_framepos))); + ret.frame = frame_at_minute (minute_at_beat_locked (_metrics, ceil (beat_at_framepos))); + + return ret; } else { - return frame_at_minute (minute_at_beat_locked (_metrics, floor (beat_at_framepos + 0.5))); + ret.frame = frame_at_minute (minute_at_beat_locked (_metrics, floor (beat_at_framepos + 0.5))); + + return ret; } break; } - return 0; + return MusicFrame (0, 0); } void @@ -3837,7 +4161,8 @@ TempoMap::get_grid (vector& points, const TempoSection tempo = tempo_section_at_minute_locked (_metrics, minute_at_frame (pos)); const MeterSection meter = meter_section_at_minute_locked (_metrics, minute_at_frame (pos)); const BBT_Time bbt = bbt_at_beat_locked (_metrics, cnt); - points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, tempo.c_func())); + + points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, tempo.c())); ++cnt; } } else { @@ -3854,7 +4179,7 @@ TempoMap::get_grid (vector& points, pos = frame_at_minute (minute_at_bbt_locked (_metrics, bbt)); const TempoSection tempo = tempo_section_at_minute_locked (_metrics, minute_at_frame (pos)); const MeterSection meter = meter_section_at_minute_locked (_metrics, minute_at_frame (pos)); - points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, tempo.c_func())); + points.push_back (BBTPoint (meter, tempo_at_minute_locked (_metrics, minute_at_frame (pos)), pos, bbt.bars, bbt.beats, tempo.c())); bbt.bars += bar_mod; } } @@ -3868,6 +4193,14 @@ TempoMap::tempo_section_at_frame (framepos_t frame) const return tempo_section_at_minute_locked (_metrics, minute_at_frame (frame)); } +TempoSection& +TempoMap::tempo_section_at_frame (framepos_t frame) +{ + Glib::Threads::RWLock::ReaderLock lm (lock); + + return tempo_section_at_minute_locked (_metrics, minute_at_frame (frame)); +} + const TempoSection& TempoMap::tempo_section_at_minute_locked (const Metrics& metrics, double minute) const { @@ -3897,7 +4230,35 @@ TempoMap::tempo_section_at_minute_locked (const Metrics& metrics, double minute) return *prev; } +TempoSection& +TempoMap::tempo_section_at_minute_locked (const Metrics& metrics, double minute) +{ + TempoSection* prev = 0; + + TempoSection* t; + + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + if ((*i)->is_tempo()) { + t = static_cast (*i); + if (!t->active()) { + continue; + } + if (prev && t->minute() > minute) { + break; + } + + prev = t; + } + } + + if (prev == 0) { + fatal << endmsg; + abort(); /*NOTREACHED*/ + } + + return *prev; +} const TempoSection& TempoMap::tempo_section_at_beat_locked (const Metrics& metrics, const double& beat) const { @@ -3909,6 +4270,11 @@ TempoMap::tempo_section_at_beat_locked (const Metrics& metrics, const double& be for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((*i)->is_tempo()) { t = static_cast (*i); + + if (!t->active()) { + continue; + } + if (prev_t && ((t->pulse() - prev_m->pulse()) * prev_m->note_divisor()) + prev_m->beat() > beat) { break; } @@ -3919,6 +4285,42 @@ TempoMap::tempo_section_at_beat_locked (const Metrics& metrics, const double& be return *prev_t; } +TempoSection* +TempoMap::next_tempo_section (TempoSection* ts) const +{ + if (!ts) { + return 0; + } + + Glib::Threads::RWLock::ReaderLock lm (lock); + + TempoSection* prev = 0; + + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + + if ((*i)->is_tempo()) { + TempoSection* t = static_cast (*i); + + if (!t->active()) { + continue; + } + + if (prev && prev == ts) { + + return t; + } + + prev = t; + } + } + + if (prev == 0) { + fatal << endmsg; + abort(); /*NOTREACHED*/ + } + + return 0; +} /* 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 */ @@ -3946,6 +4348,7 @@ TempoMap::frames_per_quarter_note_at (const framepos_t& frame, const framecnt_t& ts_at = t; } } + assert (ts_at); if (ts_after) { return (60.0 * _frame_rate) / ts_at->tempo_at_minute (minute_at_frame (frame)).quarter_notes_per_minute(); @@ -4028,13 +4431,14 @@ TempoMap::fix_legacy_session () { MeterSection* prev_m = 0; TempoSection* prev_t = 0; + bool have_initial_t = false; for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { MeterSection* m; TempoSection* t; if ((m = dynamic_cast(*i)) != 0) { - if (!m->movable()) { + if (m->initial()) { pair bbt = make_pair (0.0, BBT_Time (1, 1, 0)); m->set_beat (bbt); m->set_pulse (0.0); @@ -4061,15 +4465,26 @@ TempoMap::fix_legacy_session () continue; } - if (!t->movable()) { + if (t->initial()) { t->set_pulse (0.0); t->set_minute (0.0); t->set_position_lock_style (AudioTime); prev_t = t; + have_initial_t = true; continue; } if (prev_t) { + /* some 4.x sessions have no initial (non-movable) tempo. */ + if (!have_initial_t) { + prev_t->set_pulse (0.0); + prev_t->set_minute (0.0); + prev_t->set_position_lock_style (AudioTime); + prev_t->set_initial (true); + prev_t->set_locked_to_meter (true); + have_initial_t = true; + } + 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); @@ -4084,6 +4499,30 @@ TempoMap::fix_legacy_session () } } } +void +TempoMap::fix_legacy_end_session () +{ + TempoSection* prev_t = 0; + + for (Metrics::iterator i = _metrics.begin(); i != _metrics.end(); ++i) { + TempoSection* t; + + if ((t = dynamic_cast(*i)) != 0) { + + if (!t->active()) { + continue; + } + + if (prev_t) { + if (prev_t->type() != TempoSection::Constant) { + prev_t->set_end_note_types_per_minute (t->note_types_per_minute()); + } + } + + prev_t = t; + } + } +} XMLNode& TempoMap::get_state () @@ -4160,6 +4599,12 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) fix_legacy_session(); break; } + + if (t->legacy_end()) { + fix_legacy_end_session(); + break; + } + break; } } @@ -4208,35 +4653,36 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) } void -TempoMap::dump (const Metrics& metrics, std::ostream& o) const +TempoMap::dump (std::ostream& o) const { Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); const MeterSection* m; const TempoSection* t; const TempoSection* prev_t = 0; - for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { + for (Metrics::const_iterator i = _metrics.begin(); i != _metrics.end(); ++i) { if ((t = dynamic_cast(*i)) != 0) { - o << "Tempo @ " << *i << t->note_types_per_minute() << " BPM (pulse = 1/" << t->note_type() + o << "Tempo @ " << *i << " start : " << t->note_types_per_minute() << " end : " << t->end_note_types_per_minute() << " BPM (pulse = 1/" << t->note_type() << " type= " << enum_2_string (t->type()) << ") " << " at pulse= " << t->pulse() - << " minute= " << t->minute() << " frame= " << t->frame() << " (movable? " << t->movable() << ')' + << " minute= " << t->minute() << " frame= " << t->frame() << " (initial? " << t->initial() << ')' << " pos lock: " << enum_2_string (t->position_lock_style()) << std::endl; if (prev_t) { - o << std::setprecision (17) << " current : " << t->note_types_per_minute() + o << " current start : " << t->note_types_per_minute() + << " current end : " << t->end_note_types_per_minute() << " | " << t->pulse() << " | " << t->frame() << " | " << t->minute() << std::endl; o << " previous : " << prev_t->note_types_per_minute() << " | " << prev_t->pulse() << " | " << prev_t->frame() << " | " << prev_t->minute() << std::endl; o << " calculated : " << prev_t->tempo_at_pulse (t->pulse()) - << " | " << prev_t->pulse_at_ntpm (t->note_types_per_minute(), t->minute()) - << " | " << frame_at_minute (prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse())) - << " | " << prev_t->minute_at_ntpm (t->note_types_per_minute(), t->pulse()) << std::endl; + << " | " << prev_t->pulse_at_ntpm (prev_t->end_note_types_per_minute(), t->minute()) + << " | " << frame_at_minute (prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse())) + << " | " << prev_t->minute_at_ntpm (prev_t->end_note_types_per_minute(), t->pulse()) << std::endl; } 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; + << " pos lock: " << enum_2_string (m->position_lock_style()) << " (initial? " << m->initial() << ')' << endl; } } o << "------" << std::endl; @@ -4276,16 +4722,16 @@ void TempoMap::insert_time (framepos_t where, framecnt_t amount) { for (Metrics::reverse_iterator i = _metrics.rbegin(); i != _metrics.rend(); ++i) { - if ((*i)->frame() >= where && (*i)->movable ()) { + if ((*i)->frame() >= where && !(*i)->initial ()) { MeterSection* ms; TempoSection* ts; if ((ms = dynamic_cast (*i)) != 0) { - gui_move_meter (ms, (*i)->frame() + amount); + gui_set_meter_position (ms, (*i)->frame() + amount); } if ((ts = dynamic_cast (*i)) != 0) { - gui_move_tempo (ts, (*i)->frame() + amount, 0); + gui_set_tempo_position (ts, (*i)->frame() + amount, 0); } } } @@ -4358,11 +4804,12 @@ TempoMap::remove_time (framepos_t where, framecnt_t amount) * pos can be -ve, if required. */ framepos_t -TempoMap::framepos_plus_qn (framepos_t frame, Evoral::Beats quarter_note) const +TempoMap::framepos_plus_qn (framepos_t frame, Evoral::Beats beats) const { Glib::Threads::RWLock::ReaderLock lm (lock); + const double frame_qn = pulse_at_minute_locked (_metrics, minute_at_frame (frame)) * 4.0; - return frame_at_minute (minute_at_quarter_note_locked (_metrics, quarter_note_at_minute_locked (_metrics, minute_at_frame (frame)) + quarter_note.to_double())); + return frame_at_minute (minute_at_pulse_locked (_metrics, (frame_qn + beats.to_double()) / 4.0)); } framepos_t