X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Ftempo.cc;h=0bb2fea0cf3e0c6a22a1f25a07a916bdbab49045;hb=d90e2b42211ead2a38afd5590e2937992312795e;hp=2ebe85f27b8183039b3ffffe63d740f7fef53f1b;hpb=69c7dac1a1ee70c5a4053acdc9dd139c986698a2;p=ardour.git diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 2ebe85f27b..0bb2fea0cf 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -19,17 +19,15 @@ #include #include +#include #include -#include - -#include +#include #include "pbd/xml++.h" #include "evoral/types.hpp" #include "ardour/debug.h" #include "ardour/tempo.h" -#include "ardour/utils.h" #include "i18n.h" #include @@ -45,24 +43,25 @@ using Timecode::BBT_Time; Meter TempoMap::_default_meter (4.0, 4.0); Tempo TempoMap::_default_tempo (120.0); -double -Tempo::frames_per_beat (framecnt_t sr) const -{ - return (60.0 * sr) / _beats_per_minute; -} - /***********************************************************************/ double -Meter::frames_per_division (const Tempo& tempo, framecnt_t sr) const +Meter::frames_per_grid (const Tempo& tempo, framecnt_t sr) const { + /* This is tempo- and meter-sensitive. The number it returns + is based on the interval between any two lines in the + grid that is constructed from tempo and meter sections. + + The return value IS NOT interpretable in terms of "beats". + */ + return (60.0 * sr) / (tempo.beats_per_minute() * (_note_type/tempo.note_type())); } double Meter::frames_per_bar (const Tempo& tempo, framecnt_t sr) const { - return frames_per_division (tempo, sr) * _divisions_per_bar; + return frames_per_grid (tempo, sr) * _divisions_per_bar; } /***********************************************************************/ @@ -156,8 +155,8 @@ void TempoSection::update_bar_offset_from_bbt (const Meter& m) { - _bar_offset = ((start().beats - 1) * BBT_Time::ticks_per_bar_division + start().ticks) / - (m.divisions_per_bar() * BBT_Time::ticks_per_bar_division); + _bar_offset = ((start().beats - 1) * BBT_Time::ticks_per_beat + start().ticks) / + (m.divisions_per_bar() * BBT_Time::ticks_per_beat); DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Tempo set bar offset to %1 from %2 w/%3\n", _bar_offset, start(), m.divisions_per_bar())); } @@ -174,9 +173,9 @@ TempoSection::update_bbt_time_from_bar_offset (const Meter& meter) new_start.bars = start().bars; - double ticks = BBT_Time::ticks_per_bar_division * meter.divisions_per_bar() * _bar_offset; - new_start.beats = (uint32_t) floor(ticks/BBT_Time::ticks_per_bar_division); - new_start.ticks = (uint32_t) fmod (ticks, BBT_Time::ticks_per_bar_division); + double ticks = BBT_Time::ticks_per_beat * meter.divisions_per_bar() * _bar_offset; + new_start.beats = (uint32_t) floor (ticks/BBT_Time::ticks_per_beat); + new_start.ticks = 0; /* (uint32_t) fmod (ticks, BBT_Time::ticks_per_beat); */ /* remember the 1-based counting properties of beats */ new_start.beats += 1; @@ -277,9 +276,7 @@ struct MetricSectionSorter { TempoMap::TempoMap (framecnt_t fr) { - metrics = new Metrics; _frame_rate = fr; - last_bbt_valid = false; BBT_Time start; start.bars = 1; @@ -294,8 +291,8 @@ TempoMap::TempoMap (framecnt_t fr) /* note: frame time is correct (zero) for both of these */ - metrics->push_back (t); - metrics->push_back (m); + metrics.push_back (t); + metrics.push_back (m); } TempoMap::~TempoMap () @@ -308,28 +305,29 @@ TempoMap::remove_tempo (const TempoSection& tempo, bool complete_operation) bool removed = false; { - Glib::RWLock::WriterLock lm (lock); + Glib::Threads::RWLock::WriterLock lm (lock); Metrics::iterator i; - for (i = metrics->begin(); i != metrics->end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { if (dynamic_cast (*i) != 0) { if (tempo.frame() == (*i)->frame()) { if ((*i)->movable()) { - metrics->erase (i); + metrics.erase (i); removed = true; break; } } } } - } - if (removed) { - if (complete_operation) { + if (removed && complete_operation) { recompute_map (false); - PropertyChanged (PropertyChange ()); } } + + if (removed && complete_operation) { + PropertyChanged (PropertyChange ()); + } } void @@ -338,34 +336,35 @@ TempoMap::remove_meter (const MeterSection& tempo, bool complete_operation) bool removed = false; { - Glib::RWLock::WriterLock lm (lock); + Glib::Threads::RWLock::WriterLock lm (lock); Metrics::iterator i; - for (i = metrics->begin(); i != metrics->end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { if (dynamic_cast (*i) != 0) { if (tempo.frame() == (*i)->frame()) { if ((*i)->movable()) { - metrics->erase (i); + metrics.erase (i); removed = true; break; } } } } - } - if (removed) { - if (complete_operation) { + if (removed && complete_operation) { recompute_map (true); - PropertyChanged (PropertyChange ()); } } + + if (removed && complete_operation) { + PropertyChanged (PropertyChange ()); + } } void TempoMap::do_insert (MetricSection* section) { - bool reassign_tempo_bbt = false; + bool need_add = true; assert (section->start().ticks == 0); @@ -379,8 +378,6 @@ TempoMap::do_insert (MetricSection* section) sections based on this new meter. */ - reassign_tempo_bbt = true; - if ((section->start().beats != 1) || (section->start().ticks != 0)) { BBT_Time corrected = section->start(); @@ -394,59 +391,85 @@ TempoMap::do_insert (MetricSection* section) } } - Metrics::iterator i; + /* Look for any existing MetricSection that is of the same type and - at the same time as the new one, and remove it before adding - the new one. + in the same bar as the new one, and remove it before adding + the new one. Note that this means that if we find a matching, + existing section, we can break out of the loop since we're + guaranteed that there is only one such match. */ - Metrics::iterator to_remove = metrics->end (); + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { - for (i = metrics->begin(); i != metrics->end(); ++i) { + bool const iter_is_tempo = dynamic_cast (*i) != 0; + bool const insert_is_tempo = dynamic_cast (section) != 0; - int const c = (*i)->compare (*section); + if (iter_is_tempo && insert_is_tempo) { - if (c < 0) { - /* this section is before the one to be added; go back round */ - continue; - } else if (c > 0) { - /* this section is after the one to be added; there can't be any at the same time */ - break; - } + /* Tempo sections */ - /* hacky comparison of type */ - bool const a = dynamic_cast (*i) != 0; - bool const b = dynamic_cast (section) != 0; + if ((*i)->start().bars == section->start().bars && + (*i)->start().beats == section->start().beats) { - if (a == b) { - to_remove = i; - break; - } - } + if (!(*i)->movable()) { + + /* can't (re)move this section, so overwrite + * its data content (but not its properties as + * a section). + */ + + *(dynamic_cast(*i)) = *(dynamic_cast(section)); + need_add = false; + } else { + metrics.erase (i); + } + break; + } - if (to_remove != metrics->end()) { - /* remove the MetricSection at the same time as the one we are about to add */ - metrics->erase (to_remove); - } + } else if (!iter_is_tempo && !insert_is_tempo) { - /* Add the given MetricSection */ + /* Meter Sections */ - for (i = metrics->begin(); i != metrics->end(); ++i) { + if ((*i)->start().bars == section->start().bars) { - if ((*i)->compare (*section) < 0) { - continue; - } + if (!(*i)->movable()) { + + /* can't (re)move this section, so overwrite + * its data content (but not its properties as + * a section + */ + + *(dynamic_cast(*i)) = *(dynamic_cast(section)); + need_add = false; + } else { + metrics.erase (i); + + } - metrics->insert (i, section); - break; + break; + } + } else { + /* non-matching types, so we don't care */ + } } - if (i == metrics->end()) { - metrics->insert (metrics->end(), section); + /* Add the given MetricSection, if we didn't just reset an existing + * one above + */ + + if (need_add) { + + Metrics::iterator i; + + for (i = metrics.begin(); i != metrics.end(); ++i) { + if ((*i)->start() > section->start()) { + break; + } + } + + metrics.insert (i, section); } - - recompute_map (reassign_tempo_bbt); } void @@ -454,13 +477,16 @@ TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const BBT_T { const TempoSection& first (first_tempo()); - if (ts != first) { + if (ts.start() != first.start()) { remove_tempo (ts, false); add_tempo (tempo, where); } else { - /* cannot move the first tempo section */ - *((Tempo*)&first) = tempo; - recompute_map (false); + { + Glib::Threads::RWLock::WriterLock lm (lock); + /* cannot move the first tempo section */ + *((Tempo*)&first) = tempo; + recompute_map (false); + } } PropertyChanged (PropertyChange ()); @@ -470,7 +496,7 @@ void TempoMap::add_tempo (const Tempo& tempo, BBT_Time where) { { - Glib::RWLock::WriterLock lm (lock); + Glib::Threads::RWLock::WriterLock lm (lock); /* new tempos always start on a beat */ where.ticks = 0; @@ -490,7 +516,7 @@ TempoMap::add_tempo (const Tempo& tempo, BBT_Time where) now see if we can find better candidates. */ - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { const MeterSection* m; @@ -506,10 +532,13 @@ TempoMap::add_tempo (const Tempo& tempo, BBT_Time where) ts->update_bar_offset_from_bbt (*meter); /* and insert it */ - + do_insert (ts); + + recompute_map (false); } + PropertyChanged (PropertyChange ()); } @@ -518,13 +547,16 @@ TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_T { const MeterSection& first (first_meter()); - if (ms != first) { + if (ms.start() != first.start()) { remove_meter (ms, false); add_meter (meter, where); } else { - /* cannot move the first meter section */ - *((Meter*)&first) = meter; - recompute_map (true); + { + Glib::Threads::RWLock::WriterLock lm (lock); + /* cannot move the first meter section */ + *((Meter*)&first) = meter; + recompute_map (true); + } } PropertyChanged (PropertyChange ()); @@ -534,7 +566,7 @@ void TempoMap::add_meter (const Meter& meter, BBT_Time where) { { - Glib::RWLock::WriterLock lm (lock); + Glib::Threads::RWLock::WriterLock lm (lock); /* a new meter always starts a new bar on the first beat. so round the start time appropriately. remember that @@ -550,10 +582,12 @@ TempoMap::add_meter (const Meter& meter, BBT_Time where) /* new meters *always* start on a beat. */ where.ticks = 0; - + do_insert (new MeterSection (where, meter.divisions_per_bar(), meter.note_divisor())); + recompute_map (true); } + #ifndef NDEBUG if (DEBUG_ENABLED(DEBUG::TempoMap)) { dump (std::cerr); @@ -569,9 +603,13 @@ TempoMap::change_initial_tempo (double beats_per_minute, double note_type) Tempo newtempo (beats_per_minute, note_type); TempoSection* t; - for (Metrics::iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((t = dynamic_cast (*i)) != 0) { - *((Tempo*) t) = newtempo; + { + Glib::Threads::RWLock::WriterLock lm (lock); + *((Tempo*) t) = newtempo; + recompute_map (false); + } PropertyChanged (PropertyChange ()); break; } @@ -590,7 +628,7 @@ TempoMap::change_existing_tempo_at (framepos_t where, double beats_per_minute, d /* find the TempoSection immediately preceding "where" */ - for (first = 0, i = metrics->begin(), prev = 0; i != metrics->end(); ++i) { + for (first = 0, i = metrics.begin(), prev = 0; i != metrics.end(); ++i) { if ((*i)->frame() > where) { break; @@ -617,7 +655,13 @@ TempoMap::change_existing_tempo_at (framepos_t where, double beats_per_minute, d /* reset */ - *((Tempo*)prev) = newtempo; + { + Glib::Threads::RWLock::WriterLock lm (lock); + /* cannot move the first tempo section */ + *((Tempo*)prev) = newtempo; + recompute_map (false); + } + PropertyChanged (PropertyChange ()); } @@ -626,7 +670,7 @@ TempoMap::first_meter () const { const MeterSection *m = 0; - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((m = dynamic_cast (*i)) != 0) { return *m; } @@ -642,7 +686,7 @@ TempoMap::first_tempo () const { const TempoSection *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) { return *t; } @@ -654,121 +698,76 @@ TempoMap::first_tempo () const } void -TempoMap::timestamp_metrics_from_audio_time () +TempoMap::require_map_to (framepos_t pos) { - Metrics::iterator i; - const MeterSection* meter; - const TempoSection* tempo; - MeterSection *m; - TempoSection *t; - - meter = &first_meter (); - tempo = &first_tempo (); - - BBT_Time start; - BBT_Time end; - - // cerr << "\n###################### TIMESTAMP via AUDIO ##############\n" << endl; - - bool first = true; - MetricSection* prev = 0; - - for (i = metrics->begin(); i != metrics->end(); ++i) { - - BBT_Time bbt; - TempoMetric metric (*meter, *tempo); - - if (prev) { - metric.set_start (prev->start()); - metric.set_frame (prev->frame()); - } else { - // metric will be at frames=0 bbt=1|1|0 by default - // which is correct for our purpose - } - - bbt_time_with_metric ((*i)->frame(), bbt, metric); - - // cerr << "timestamp @ " << (*i)->frame() << " with " << bbt.bars << "|" << bbt.beats << "|" << bbt.ticks << " => "; - - if (first) { - first = false; - } else { + Glib::Threads::RWLock::WriterLock lm (lock); - if (bbt.ticks > BBT_Time::ticks_per_bar_division/2) { - /* round up to next beat */ - bbt.beats += 1; - } - - bbt.ticks = 0; + if (_map.empty() || _map.back().frame < pos) { + extend_map (pos); + } +} - if (bbt.beats != 1) { - /* round up to next bar */ - bbt.bars += 1; - bbt.beats = 1; - } - } +void +TempoMap::require_map_to (const BBT_Time& bbt) +{ + Glib::Threads::RWLock::WriterLock lm (lock); - // cerr << bbt << endl; + /* since we have no idea where BBT is if its off the map, see the last + * point in the map is past BBT, and if not add an arbitrary amount of + * time until it is. + */ - (*i)->set_start (bbt); - - if ((t = dynamic_cast(*i)) != 0) { - tempo = t; - // cerr << "NEW TEMPO, frame = " << (*i)->frame() << " start = " << (*i)->start() <(*i)) != 0) { - meter = m; - // cerr << "NEW METER, frame = " << (*i)->frame() << " start = " << (*i)->start() <= (bbt.bars + 1)) { + break; } - - prev = (*i); - } - -#ifndef NDEBUG - if (DEBUG_ENABLED(DEBUG::TempoMap)) { - dump (cerr); + /* add some more distance, using bigger steps each time */ + extend_map (_map.back().frame + (_frame_rate * 60 * additional_minutes)); + additional_minutes *= 2; } -#endif - } void TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) { - MeterSection* meter; - TempoSection* tempo; - TempoSection* ts; - MeterSection* ms; - double divisions_per_bar; - double beat_frames; - double frames_per_bar; + /* CALLER MUST HOLD WRITE LOCK */ + + MeterSection* meter = 0; + TempoSection* tempo = 0; double current_frame; BBT_Time current; Metrics::iterator next_metric; if (end < 0) { - if (_map.empty()) { - /* compute 1 mins worth */ - end = _frame_rate * 60; - } else { - end = _map.back().frame; + + /* we will actually stop once we hit + the last metric. + */ + end = max_framepos; + + } else { + if (!_map.empty ()) { + /* never allow the map to be shortened */ + end = max (end, _map.back().frame); } } DEBUG_TRACE (DEBUG::TempoMath, string_compose ("recomputing tempo map, zero to %1\n", end)); - - _map.clear (); - for (Metrics::iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { + MeterSection* ms; + if ((ms = dynamic_cast (*i)) != 0) { meter = ms; break; } } - for (Metrics::iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { + TempoSection* ts; + if ((ts = dynamic_cast (*i)) != 0) { tempo = ts; break; @@ -785,19 +784,17 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) current.beats = 1; current.ticks = 0; - divisions_per_bar = meter->divisions_per_bar (); - frames_per_bar = meter->frames_per_bar (*tempo, _frame_rate); - beat_frames = meter->frames_per_division (*tempo,_frame_rate); - if (reassign_tempo_bbt) { - TempoSection* rtempo = tempo; MeterSection* rmeter = meter; DEBUG_TRACE (DEBUG::TempoMath, "\tUpdating tempo marks BBT time from bar offset\n"); - for (Metrics::iterator i = metrics->begin(); i != metrics->end(); ++i) { - + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { + + TempoSection* ts; + MeterSection* ms; + if ((ts = dynamic_cast(*i)) != 0) { /* reassign the BBT time of this tempo section @@ -805,7 +802,6 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) */ ts->update_bbt_time_from_bar_offset (*rmeter); - rtempo = ts; } else if ((ms = dynamic_cast(*i)) != 0) { rmeter = ms; @@ -816,18 +812,92 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) } } - DEBUG_TRACE (DEBUG::TempoMath, string_compose ("start with meter = %1 tempo = %2 dpb %3 fpb %4\n", - *((Meter*)meter), *((Tempo*)tempo), divisions_per_bar, beat_frames)); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("start with meter = %1 tempo = %2\n", *((Meter*)meter), *((Tempo*)tempo))); - next_metric = metrics->begin(); + next_metric = metrics.begin(); ++next_metric; // skip meter (or tempo) ++next_metric; // skip tempo (or meter) + _map.clear (); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add first bar at 1|1 @ %2\n", current.bars, current_frame)); - _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), Bar, 1, 1)); + _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), 1, 1)); + + if (end == 0) { + /* silly call from Session::process() during startup + */ + return; + } + + _extend_map (tempo, meter, next_metric, current, current_frame, end); +} + +void +TempoMap::extend_map (framepos_t end) +{ + /* CALLER MUST HOLD WRITE LOCK */ + + if (_map.empty()) { + recompute_map (false, end); + return; + } + + BBTPointList::const_iterator i = _map.end(); + Metrics::iterator next_metric; + + --i; + + BBT_Time last_metric_start; + + if ((*i).tempo->frame() > (*i).meter->frame()) { + last_metric_start = (*i).tempo->start(); + } else { + last_metric_start = (*i).meter->start(); + } + + /* find the metric immediately after the tempo + meter sections for the + * last point in the map + */ + + for (next_metric = metrics.begin(); next_metric != metrics.end(); ++next_metric) { + if ((*next_metric)->start() > last_metric_start) { + break; + } + } + + /* we cast away const here because this is the one place where we need + * to actually modify the frame time of each metric section. + */ + + _extend_map (const_cast ((*i).tempo), + const_cast ((*i).meter), + next_metric, BBT_Time ((*i).bar, (*i).beat, 0), (*i).frame, end); +} + +void +TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, + Metrics::iterator next_metric, + BBT_Time current, framepos_t current_frame, framepos_t end) +{ + /* CALLER MUST HOLD WRITE LOCK */ + + TempoSection* ts; + MeterSection* ms; + double beat_frames; + framepos_t bar_start_frame; + + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Extend map to %1 from %2 = %3\n", end, current, current_frame)); + + if (current.beats == 1) { + bar_start_frame = current_frame; + } else { + bar_start_frame = 0; + } + + beat_frames = meter->frames_per_grid (*tempo,_frame_rate); while (current_frame < end) { - + current.beats++; current_frame += beat_frames; @@ -836,15 +906,15 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) current.beats = 1; } - if (next_metric != metrics->end()) { + if (next_metric != metrics.end()) { /* no operator >= so invert operator < */ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("now at %1 next metric @ %2\n", current, (*next_metric)->start())); if (!(current < (*next_metric)->start())) { - + set_metrics: if (((ts = dynamic_cast (*next_metric)) != 0)) { tempo = ts; @@ -866,22 +936,45 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) if (tempo->start().ticks != 0) { - double next_beat_frames = meter->frames_per_division (*tempo,_frame_rate); + double next_beat_frames = tempo->frames_per_beat (_frame_rate); DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into non-beat-aligned tempo metric at %1 = %2, adjust next beat using %3\n", - tempo->start(), current_frame, tempo->bar_offset())); + tempo->start(), current_frame, tempo->bar_offset())); /* back up to previous beat */ current_frame -= beat_frames; - /* set tempo section location based on offset from last beat */ - tempo->set_frame (current_frame + (ts->bar_offset() * beat_frames)); - /* advance to the location of the new (adjusted) beat */ - current_frame += (ts->bar_offset() * beat_frames) + ((1.0 - ts->bar_offset()) * next_beat_frames); + + /* set tempo section location + * based on offset from last + * bar start + */ + tempo->set_frame (bar_start_frame + + llrint ((ts->bar_offset() * meter->divisions_per_bar() * beat_frames))); + + /* advance to the location of + * the new (adjusted) beat. do + * this by figuring out the + * offset within the beat that + * would have been there + * without the tempo + * change. then stretch the + * beat accordingly. + */ + + double offset_within_old_beat = (tempo->frame() - current_frame) / beat_frames; + + current_frame += (offset_within_old_beat * beat_frames) + ((1.0 - offset_within_old_beat) * next_beat_frames); + + /* next metric doesn't have to + * match this precisely to + * merit a reloop ... + */ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Adjusted last beat to %1\n", current_frame)); + } else { DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into beat-aligned tempo metric at %1 = %2\n", - tempo->start(), current_frame)); + tempo->start(), current_frame)); tempo->set_frame (current_frame); } @@ -893,41 +986,55 @@ TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end) * start of a bar. */ - DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into meter section at %1 (%2)\n", - meter->start(), current_frame)); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into meter section at %1 vs %2 (%3)\n", + meter->start(), current, current_frame)); assert (current.beats == 1); meter->set_frame (current_frame); } - divisions_per_bar = meter->divisions_per_bar (); - frames_per_bar = meter->frames_per_bar (*tempo, _frame_rate); - beat_frames = meter->frames_per_division (*tempo, _frame_rate); + beat_frames = meter->frames_per_grid (*tempo, _frame_rate); DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n", - beat_frames, divisions_per_bar, *((Meter*)meter), *((Tempo*)tempo))); + beat_frames, meter->divisions_per_bar(), *((Meter*)meter), *((Tempo*)tempo))); ++next_metric; + + if (next_metric != metrics.end() && ((*next_metric)->start() == current)) { + /* same position so go back and set this one up before advancing + */ + goto set_metrics; + } + } - } + } if (current.beats == 1) { DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", current.bars, current_frame)); - _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), Bar, current.bars, 1)); + _map.push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current_frame), current.bars, 1)); + bar_start_frame = current_frame; } else { DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Beat at %1|%2 @ %3\n", current.bars, current.beats, current_frame)); - _map.push_back (BBTPoint (*meter, *tempo, (framepos_t) llrint(current_frame), Beat, current.bars, current.beats)); + _map.push_back (BBTPoint (*meter, *tempo, (framepos_t) llrint(current_frame), current.bars, current.beats)); + } + + if (next_metric == metrics.end()) { + /* no more metrics - we've timestamped them all, stop here */ + if (end == max_framepos) { + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("stop extending map now that we've reach the end @ %1|%2 = %3\n", + current.bars, current.beats, current_frame)); + break; + } } } } TempoMetric -TempoMap::metric_at (framepos_t frame) const +TempoMap::metric_at (framepos_t frame, Metrics::const_iterator* last) const { + Glib::Threads::RWLock::ReaderLock lm (lock); TempoMetric m (first_meter(), first_tempo()); - const Meter* meter; - const Tempo* tempo; /* at this point, we are *guaranteed* to have m.meter and m.tempo pointing at something, because we insert the default tempo and meter during @@ -936,34 +1043,27 @@ TempoMap::metric_at (framepos_t frame) const now see if we can find better candidates. */ - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { - - // cerr << "Looking at a metric section " << **i << endl; + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((*i)->frame() > frame) { break; } - if ((tempo = dynamic_cast(*i)) != 0) { - m.set_tempo (*tempo); - } else if ((meter = dynamic_cast(*i)) != 0) { - m.set_meter (*meter); - } + m.set_metric(*i); - m.set_frame ((*i)->frame ()); - m.set_start ((*i)->start ()); + if (last) { + *last = i; + } } - // cerr << "for framepos " << frame << " returning " << m.meter() << " @ " << m.tempo() << " location " << m.frame() << " = " << m.start() << endl; return m; } TempoMetric TempoMap::metric_at (BBT_Time bbt) const { + Glib::Threads::RWLock::ReaderLock lm (lock); TempoMetric m (first_meter(), first_tempo()); - const Meter* meter; - const Tempo* tempo; /* at this point, we are *guaranteed* to have m.meter and m.tempo pointing at something, because we insert the default tempo and meter during @@ -972,7 +1072,7 @@ TempoMap::metric_at (BBT_Time bbt) const now see if we can find better candidates. */ - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { BBT_Time section_start ((*i)->start()); @@ -980,338 +1080,196 @@ TempoMap::metric_at (BBT_Time bbt) const break; } - if ((tempo = dynamic_cast(*i)) != 0) { - m.set_tempo (*tempo); - } else if ((meter = dynamic_cast(*i)) != 0) { - m.set_meter (*meter); - } - - m.set_frame ((*i)->frame ()); - m.set_start (section_start); + m.set_metric (*i); } return m; } void -TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt) const +TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt) { - { - Glib::RWLock::ReaderLock lm (lock); - bbt_time_unlocked (frame, bbt); + require_map_to (frame); + + Glib::Threads::RWLock::ReaderLock lm (lock); + + if (frame < 0) { + bbt.bars = 1; + bbt.beats = 1; + bbt.ticks = 0; + warning << string_compose (_("tempo map asked for BBT time at frame %1\n"), frame) << endmsg; + return; } + + return bbt_time (frame, bbt, bbt_before_or_at (frame)); } void -TempoMap::bbt_time_unlocked (framepos_t frame, BBT_Time& bbt) const +TempoMap::bbt_time_rt (framepos_t frame, BBT_Time& bbt) { - bbt_time_with_metric (frame, bbt, metric_at (frame)); + Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); + + if (!lm.locked()) { + throw std::logic_error ("TempoMap::bbt_time_rt() could not lock tempo map"); + } + + if (_map.empty() || _map.back().frame < frame) { + throw std::logic_error (string_compose ("map not long enough to reach %1", frame)); + } + + return bbt_time (frame, bbt, bbt_before_or_at (frame)); } void -TempoMap::bbt_time_with_metric (framepos_t frame, BBT_Time& bbt, const TempoMetric& metric) const +TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt, const BBTPointList::const_iterator& i) { - const double divisions_per_bar = metric.meter().divisions_per_bar(); - const double frames_per_tick = metric.meter().frames_per_division (metric.tempo(),_frame_rate) / BBT_Time::ticks_per_bar_division; + /* CALLER MUST HOLD READ LOCK */ - /* now compute how far beyond the metric we actually are, and add the - * relevant number of ticks to the metric's BBT time - */ + bbt.bars = (*i).bar; + bbt.beats = (*i).beat; - framecnt_t frame_diff = frame - metric.frame(); - uint32_t tick_diff = (uint32_t) lrint ((double) frame_diff / frames_per_tick); - - bbt.ticks = metric.start().ticks + tick_diff; - uint32_t beat_overflow = bbt.ticks / (uint32_t) BBT_Time::ticks_per_bar_division; - bbt.ticks = bbt.ticks % (uint32_t) BBT_Time::ticks_per_bar_division; - bbt.beats = metric.start().beats + beat_overflow; - /* bbt.beats uses 1-based counting, so adjust to get the right answer */ - uint32_t bar_overflow = (bbt.beats - 1) / (uint32_t) divisions_per_bar; - bbt.bars = metric.start().bars + bar_overflow; - - /* fmod will map bbt.beats as follows: - - Beats divisions per bar Normalized beat - 0 N => 0 - 1 N => 1 - 2 N => 2 - 3 N => 3 - . - . - . - N-1 N => N-1 - N N => 0 - N+1 N => 1 - . - . - . - 2N-1 N => N-1 - 2N N => 0 - - so, the only special cases are 0, N, 2N etc. however bbt.beats is - never zero, so the only actual special cases are N, 2N and so on, - allowing us to use a special case check for fmod () == 0 and - changing the value to divisions per bar - */ + if ((*i).frame == frame) { + bbt.ticks = 0; + } else { + bbt.ticks = llrint (((frame - (*i).frame) / (*i).tempo->frames_per_beat(_frame_rate)) * + BBT_Time::ticks_per_beat); + } +} + +framepos_t +TempoMap::frame_time (const BBT_Time& bbt) +{ + if (bbt.bars < 1) { + warning << string_compose (_("tempo map asked for frame time at bar < 1 (%1)\n"), bbt) << endmsg; + return 0; + } + + if (bbt.beats < 1) { + throw std::logic_error ("beats are counted from one"); + } + + require_map_to (bbt); - bbt.beats = (uint32_t) fmod (bbt.beats, divisions_per_bar); + Glib::Threads::RWLock::ReaderLock lm (lock); - if (bbt.beats == 0) { - bbt.beats = divisions_per_bar; + BBTPointList::const_iterator s = bbt_before_or_at (BBT_Time (1, 1, 0)); + BBTPointList::const_iterator e = bbt_before_or_at (BBT_Time (bbt.bars, bbt.beats, 0)); + + if (bbt.ticks != 0) { + return ((*e).frame - (*s).frame) + + llrint ((*e).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat)); + } else { + return ((*e).frame - (*s).frame); } } framecnt_t -TempoMap::count_frames_between (const BBT_Time& start, const BBT_Time& end) const +TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) { - TempoMetric bm = metric_at (start); - TempoMetric em = metric_at (end); - - return count_frames_with_metrics (bm, em, start, end); + BBT_Time when; + bbt_time (pos, when); + + Glib::Threads::RWLock::ReaderLock lm (lock); + return bbt_duration_at_unlocked (when, bbt, dir); } framecnt_t -TempoMap::count_frames_with_metrics (const TempoMetric& bm, const TempoMetric& em, const BBT_Time& start, const BBT_Time& end) const +TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int /*dir*/) { - framecnt_t frames = 0; - framepos_t start_frame = 0; - framepos_t end_frame = 0; - - uint32_t bar_offset = start.bars - bm.start().bars; - - double beat_offset = bar_offset*bm.meter().divisions_per_bar() - (bm.start().beats-1) + (start.beats -1) - + start.ticks/BBT_Time::ticks_per_bar_division; - - start_frame = bm.frame() + (framepos_t) rint(beat_offset * bm.meter().frames_per_division(bm.tempo(),_frame_rate)); + if (bbt.bars == 0 && bbt.beats == 0 && bbt.ticks == 0) { + return 0; + } -#if 0 - cerr << "from start " << start << " compute frame = " << start_frame - << " from metric at " << bm.frame() << " tempo = " << bm.tempo().beats_per_minute () << " meter " - << bm.meter().divisions_per_bar() << '/' << bm.meter().note_divisor() - << endl; -#endif + /* round back to the previous precise beat */ + BBTPointList::const_iterator wi = bbt_before_or_at (BBT_Time (when.bars, when.beats, 0)); + BBTPointList::const_iterator start (wi); - bar_offset = end.bars - em.start().bars; + assert (wi != _map.end()); - beat_offset = bar_offset * em.meter().divisions_per_bar() - (em.start().beats -1) + (end.beats - 1) - + end.ticks/BBT_Time::ticks_per_bar_division; + uint32_t bars = 0; + uint32_t beats = 0; - end_frame = em.frame() + (framepos_t) rint(beat_offset * em.meter().frames_per_division(em.tempo(),_frame_rate)); + while (wi != _map.end() && bars < bbt.bars) { + ++wi; + if ((*wi).is_bar()) { + ++bars; + } + } + assert (wi != _map.end()); -#if 0 - cerr << "from end " << end << " compute frame = " << end_frame - << " from metric at " << em.frame() << " tempo = " << em.tempo().beats_per_minute () << " meter " - << em.meter().divisions_per_bar() << '/' << em.meter().note_divisor() - << endl; -#endif + while (wi != _map.end() && beats < bbt.beats) { + ++wi; + ++beats; + } + assert (wi != _map.end()); - frames = end_frame - start_frame; + /* add any additional frames related to ticks in the added value */ - return frames; + if (bbt.ticks != 0) { + return ((*wi).frame - (*start).frame) + + (*wi).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat); + } else { + return ((*wi).frame - (*start).frame); + } } framepos_t -TempoMap::frame_time (const BBT_Time& bbt) const +TempoMap::round_to_bar (framepos_t fr, int dir) { - BBT_Time start ; /* 1|1|0 */ + return round_to_type (fr, dir, Bar); +} - return count_frames_between (start, bbt); +framepos_t +TempoMap::round_to_beat (framepos_t fr, int dir) +{ + return round_to_type (fr, dir, Beat); } -framecnt_t -TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) const +framepos_t +TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, int dir) { - framecnt_t frames = 0; + require_map_to (fr); - BBT_Time when; - bbt_time(pos, when); + Glib::Threads::RWLock::ReaderLock lm (lock); + BBTPointList::const_iterator i = bbt_before_or_at (fr); + BBT_Time the_beat; + uint32_t ticks_one_subdivisions_worth; + uint32_t difference; - { - Glib::RWLock::ReaderLock lm (lock); - frames = bbt_duration_at_unlocked (when, bbt,dir); - } - - return frames; -} - -framecnt_t -TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const -{ - framecnt_t frames = 0; - - double divisions_per_bar; - BBT_Time result; - - result.bars = max(1U, when.bars + dir * bbt.bars) ; - result.beats = 1; - result.ticks = 0; - - TempoMetric metric = metric_at(result); - divisions_per_bar = metric.meter().divisions_per_bar(); - - /* Reduce things to legal bbt values we have to handle possible - fractional=shorter beats at the end of measures and things like 0|11|9000 - as a duration in a 4.5/4 measure the musical decision is that the - fractional beat is also a beat , although a shorter one - */ - - if (dir >= 0) { - result.beats = when.beats + bbt.beats; - result.ticks = when.ticks + bbt.ticks; - - while (result.beats >= (divisions_per_bar + 1)) { - result.bars++; - result.beats -= (uint32_t) ceil(divisions_per_bar); - metric = metric_at(result); // maybe there is a meter change - divisions_per_bar = metric.meter().divisions_per_bar(); - - } - - /* We now counted the beats and landed in the target measure, now deal - with ticks this seems complicated, but we want to deal with the - corner case of a sequence of time signatures like 0.2/4-0.7/4 and - with request like bbt = 3|2|9000 ,so we repeat the same loop but add - ticks - */ - - /* of course gtk_ardour only allows bar with at least 1.0 beats ..... - */ - - uint32_t ticks_at_beat = (uint32_t) (result.beats == ceil(divisions_per_bar) ? - (1 - (ceil(divisions_per_bar) - divisions_per_bar))* BBT_Time::ticks_per_bar_division - : BBT_Time::ticks_per_bar_division ); - - while (result.ticks >= ticks_at_beat) { - result.beats++; - result.ticks -= ticks_at_beat; - if (result.beats >= (divisions_per_bar + 1)) { - result.bars++; - result.beats = 1; - metric = metric_at(result); // maybe there is a meter change - divisions_per_bar = metric.meter().divisions_per_bar(); - } - ticks_at_beat= (uint32_t) (result.beats == ceil(divisions_per_bar) ? - (1 - (ceil(divisions_per_bar) - divisions_per_bar) ) * BBT_Time::ticks_per_bar_division - : BBT_Time::ticks_per_bar_division); - } + bbt_time (fr, the_beat, i); + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("round %1 to nearest 1/%2 beat, before-or-at = %3 @ %4|%5 precise = %6\n", + fr, sub_num, (*i).frame, (*i).bar, (*i).beat, the_beat)); - } else { - uint32_t b = bbt.beats; - - /* count beats */ - while (b > when.beats) { - --result.bars; - result.bars = max(1U, result.bars); - metric = metric_at(result); // maybe there is a meter change - divisions_per_bar = metric.meter().divisions_per_bar(); - if (b >= ceil(divisions_per_bar)) { - b -= (uint32_t) ceil(divisions_per_bar); - } else { - b = (uint32_t) ceil(divisions_per_bar) - b + when.beats ; - } - } - result.beats = when.beats - b; - - /* count ticks */ - - if (bbt.ticks <= when.ticks) { - result.ticks = when.ticks - bbt.ticks; - } else { - - uint32_t ticks_at_beat= (uint32_t) BBT_Time::ticks_per_bar_division; - uint32_t t = bbt.ticks - when.ticks; - - do { - - if (result.beats == 1) { - --result.bars; - result.bars = max(1U, result.bars) ; - metric = metric_at(result); // maybe there is a meter change - divisions_per_bar = metric.meter().divisions_per_bar(); - result.beats = (uint32_t) ceil(divisions_per_bar); - ticks_at_beat = (uint32_t) ((1 - (ceil(divisions_per_bar) - divisions_per_bar)) * BBT_Time::ticks_per_bar_division) ; - } else { - --result.beats; - ticks_at_beat = (uint32_t) BBT_Time::ticks_per_bar_division; - } - - if (t <= ticks_at_beat) { - result.ticks = ticks_at_beat - t; - } else { - t-= ticks_at_beat; - } - } while (t > ticks_at_beat); - - } - - - } - - if (dir < 0) { - frames = count_frames_between(result, when); - } else { - frames = count_frames_between(when,result); - } - - return frames; -} - - - -framepos_t -TempoMap::round_to_bar (framepos_t fr, int dir) -{ - { - Glib::RWLock::ReaderLock lm (lock); - return round_to_type (fr, dir, Bar); - } -} - - -framepos_t -TempoMap::round_to_beat (framepos_t fr, int dir) -{ - { - Glib::RWLock::ReaderLock lm (lock); - return round_to_type (fr, dir, Beat); - } -} - -framepos_t -TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, int dir) -{ - BBT_Time the_beat; - uint32_t ticks_one_half_subdivisions_worth; - uint32_t ticks_one_subdivisions_worth; - uint32_t difference; - - bbt_time(fr, the_beat); - - ticks_one_subdivisions_worth = (uint32_t)BBT_Time::ticks_per_bar_division / sub_num; - ticks_one_half_subdivisions_worth = ticks_one_subdivisions_worth / 2; + ticks_one_subdivisions_worth = (uint32_t)BBT_Time::ticks_per_beat / sub_num; if (dir > 0) { - /* round to next */ + /* round to next (even if we're on a subdivision */ uint32_t mod = the_beat.ticks % ticks_one_subdivisions_worth; if (mod == 0) { /* right on the subdivision, so the difference is just the subdivision ticks */ - difference = ticks_one_subdivisions_worth; + the_beat.ticks += ticks_one_subdivisions_worth; } else { /* not on subdivision, compute distance to next subdivision */ - difference = ticks_one_subdivisions_worth - mod; + the_beat.ticks += ticks_one_subdivisions_worth - mod; } - the_beat = bbt_add (the_beat, BBT_Time (0, 0, difference)); + if (the_beat.ticks > BBT_Time::ticks_per_beat) { + assert (i != _map.end()); + ++i; + assert (i != _map.end()); + the_beat.ticks -= BBT_Time::ticks_per_beat; + } + } else if (dir < 0) { - /* round to previous */ + /* round to previous (even if we're on a subdivision) */ uint32_t mod = the_beat.ticks % ticks_one_subdivisions_worth; @@ -1326,174 +1284,235 @@ TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, int dir) difference = mod; } - try { - the_beat = bbt_subtract (the_beat, BBT_Time (0, 0, difference)); - } catch (...) { - /* can't go backwards from wherever pos is, so just return it */ - return fr; + if (the_beat.ticks < difference) { + if (i == _map.begin()) { + /* can't go backwards from wherever pos is, so just return it */ + return fr; + } + --i; + the_beat.ticks = BBT_Time::ticks_per_beat - the_beat.ticks; + } else { + the_beat.ticks -= difference; } } else { /* round to nearest */ - if (the_beat.ticks % ticks_one_subdivisions_worth > ticks_one_half_subdivisions_worth) { - difference = ticks_one_subdivisions_worth - (the_beat.ticks % ticks_one_subdivisions_worth); - the_beat = bbt_add (the_beat, BBT_Time (0, 0, difference)); + double rem; + + /* compute the distance to the previous and next subdivision */ + + if ((rem = fmod ((double) the_beat.ticks, (double) ticks_one_subdivisions_worth)) > ticks_one_subdivisions_worth/2.0) { + + /* closer to the next subdivision, so shift forward */ + + the_beat.ticks = lrint (the_beat.ticks + (ticks_one_subdivisions_worth - rem)); + + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("moved forward to %1\n", the_beat.ticks)); + + if (the_beat.ticks > BBT_Time::ticks_per_beat) { + assert (i != _map.end()); + ++i; + assert (i != _map.end()); + the_beat.ticks -= BBT_Time::ticks_per_beat; + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("fold beat to %1\n", the_beat)); + } + + } else if (rem > 0) { + + /* closer to previous subdivision, so shift backward */ + + if (rem > the_beat.ticks) { + if (i == _map.begin()) { + /* can't go backwards past zero, so ... */ + return 0; + } + /* step back to previous beat */ + --i; + the_beat.ticks = lrint (BBT_Time::ticks_per_beat - rem); + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("step back beat to %1\n", the_beat)); + } else { + the_beat.ticks = lrint (the_beat.ticks - rem); + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("moved backward to %1\n", the_beat.ticks)); + } } else { - // difference = ticks_one_subdivisions_worth - (the_beat.ticks % ticks_one_subdivisions_worth); - the_beat.ticks -= the_beat.ticks % ticks_one_subdivisions_worth; + /* on the subdivision, do nothing */ } } - return frame_time (the_beat); + return (*i).frame + (the_beat.ticks/BBT_Time::ticks_per_beat) * + (*i).tempo->frames_per_beat (_frame_rate); } framepos_t TempoMap::round_to_type (framepos_t frame, int dir, BBTPointType type) { - TempoMetric metric = metric_at (frame); - BBT_Time bbt; - BBT_Time start; - BBT_Time one_bar (1,0,0); - BBT_Time one_beat (0,1,0); + require_map_to (frame); - bbt_time_with_metric (frame, bbt, metric); + Glib::Threads::RWLock::ReaderLock lm (lock); + BBTPointList::const_iterator fi; + if (dir > 0) { + fi = bbt_after_or_at (frame); + } else { + fi = bbt_before_or_at (frame); + } + + assert (fi != _map.end()); + + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("round from %1 (%3|%4 @ %5) to %6 in direction %2\n", frame, dir, (*fi).bar, (*fi).beat, (*fi).frame, + (type == Bar ? "bar" : "beat"))); + switch (type) { case Bar: - DEBUG_TRACE(DEBUG::SnapBBT, string_compose ("round from %1 (%3) to bars in direction %2\n", frame, dir, bbt)); - if (dir < 0) { + /* find bar previous to 'frame' */ - /* find bar position preceding frame */ - - try { - bbt = bbt_subtract (bbt, one_bar); + if (fi == _map.begin()) { + return 0; } - catch (...) { - return frame; + if ((*fi).is_bar() && (*fi).frame == frame) { + --fi; } + while (!(*fi).is_bar()) { + if (fi == _map.begin()) { + break; + } + fi--; + } + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", + (*fi).bar, (*fi).beat, (*fi).frame)); + return (*fi).frame; } else if (dir > 0) { - /* find bar position following frame */ + /* find bar following 'frame' */ - try { - bbt = bbt_add (bbt, one_bar, metric); + if ((*fi).is_bar() && (*fi).frame == frame) { + ++fi; } - catch (...) { - return frame; + + while (!(*fi).is_bar()) { + fi++; + if (fi == _map.end()) { + --fi; + break; + } } + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", + (*fi).bar, (*fi).beat, (*fi).frame)); + return (*fi).frame; + } else { + + /* true rounding: find nearest bar */ - /* "true" rounding */ + BBTPointList::const_iterator prev = fi; + BBTPointList::const_iterator next = fi; - float midbar_beats; - float midbar_ticks; + if ((*fi).frame == frame) { + return frame; + } - midbar_beats = metric.meter().divisions_per_bar() / 2 + 1; - midbar_ticks = BBT_Time::ticks_per_bar_division * fmod (midbar_beats, 1.0f); - midbar_beats = floor (midbar_beats); + while ((*prev).beat != 1) { + if (prev == _map.begin()) { + break; + } + prev--; + } - BBT_Time midbar (bbt.bars, lrintf (midbar_beats), lrintf (midbar_ticks)); + while ((next != _map.end()) && (*next).beat != 1) { + next++; + } - if (bbt < midbar) { - /* round down */ - bbt.beats = 1; - bbt.ticks = 0; + if ((next == _map.end()) || (frame - (*prev).frame) < ((*next).frame - frame)) { + return (*prev).frame; } else { - /* round up */ - bbt.bars++; - bbt.beats = 1; - bbt.ticks = 0; + return (*next).frame; } + } - /* force beats & ticks to their values at the start of a bar */ - bbt.beats = 1; - bbt.ticks = 0; + break; case Beat: - DEBUG_TRACE(DEBUG::SnapBBT, string_compose ("round from %1 (%3) to beat in direction %2\n", frame, (dir < 0 ? "back" : "forward"), bbt)); - if (dir < 0) { - /* find beat position preceding frame */ - - try { - bbt = bbt_subtract (bbt, one_beat); + if (fi == _map.begin()) { + return 0; } - catch (...) { - return frame; + if ((*fi).frame >= frame) { + DEBUG_TRACE (DEBUG::SnapBBT, "requested frame is on beat, step back\n"); + --fi; } - - + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", + (*fi).bar, (*fi).beat, (*fi).frame)); + return (*fi).frame; } else if (dir > 0) { - - /* find beat position following frame */ - - try { - bbt = bbt_add (bbt, one_beat, metric); + if ((*fi).frame <= frame) { + DEBUG_TRACE (DEBUG::SnapBBT, "requested frame is on beat, step forward\n"); + ++fi; } - catch (...) { + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", + (*fi).bar, (*fi).beat, (*fi).frame)); + return (*fi).frame; + } else { + /* find beat nearest to frame */ + if ((*fi).frame == frame) { return frame; } - } else { - - /* "true" rounding */ - - /* round to nearest beat */ - if (bbt.ticks >= (BBT_Time::ticks_per_bar_division/2)) { + BBTPointList::const_iterator prev = fi; + BBTPointList::const_iterator next = fi; - try { - bbt = bbt_add (bbt, one_beat, metric); - } - catch (...) { - return frame; - } + /* fi is already the beat before_or_at frame, and + we've just established that its not at frame, so its + the beat before frame. + */ + ++next; + + if ((next == _map.end()) || (frame - (*prev).frame) < ((*next).frame - frame)) { + return (*prev).frame; + } else { + return (*next).frame; } } - /* force ticks to the value at the start of a beat */ - bbt.ticks = 0; break; - } - DEBUG_TRACE(DEBUG::SnapBBT, string_compose ("\tat %1 count frames from %2 to %3 = %4\n", metric.frame(), metric.start(), bbt, count_frames_between (metric.start(), bbt))); - return metric.frame() + count_frames_between (metric.start(), bbt); + /* NOTREACHED */ + assert (false); + return 0; } void -TempoMap::map (TempoMap::BBTPointList& points, framepos_t lower, framepos_t upper) +TempoMap::get_grid (TempoMap::BBTPointList::const_iterator& begin, + TempoMap::BBTPointList::const_iterator& end, + framepos_t lower, framepos_t upper) { - if (_map.empty() || upper >= _map.back().frame) { - recompute_map (false, upper); - } - - for (BBTPointList::const_iterator i = _map.begin(); i != _map.end(); ++i) { - if ((*i).frame < lower) { - continue; - } - if ((*i).frame >= upper) { - break; + { + Glib::Threads::RWLock::WriterLock lm (lock); + if (_map.empty() || (_map.back().frame < upper)) { + recompute_map (false, upper); } - points.push_back (*i); } + + begin = lower_bound (_map.begin(), _map.end(), lower); + end = upper_bound (_map.begin(), _map.end(), upper); } const TempoSection& TempoMap::tempo_section_at (framepos_t frame) const { - Glib::RWLock::ReaderLock lm (lock); + Glib::Threads::RWLock::ReaderLock lm (lock); Metrics::const_iterator i; TempoSection* prev = 0; - for (i = metrics->begin(); i != metrics->end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { TempoSection* t; if ((t = dynamic_cast (*i)) != 0) { @@ -1535,8 +1554,8 @@ TempoMap::get_state () XMLNode *root = new XMLNode ("TempoMap"); { - Glib::RWLock::ReaderLock lm (lock); - for (i = metrics->begin(); i != metrics->end(); ++i) { + Glib::Threads::RWLock::ReaderLock lm (lock); + for (i = metrics.begin(); i != metrics.end(); ++i) { root->add_child_nocopy ((*i)->get_state()); } } @@ -1548,14 +1567,13 @@ int TempoMap::set_state (const XMLNode& node, int /*version*/) { { - Glib::RWLock::WriterLock lm (lock); + Glib::Threads::RWLock::WriterLock lm (lock); XMLNodeList nlist; XMLNodeConstIterator niter; - Metrics old_metrics (*metrics); + Metrics old_metrics (metrics); MeterSection* last_meter = 0; - - metrics->clear(); + metrics.clear(); nlist = node.children(); @@ -1566,7 +1584,7 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) try { TempoSection* ts = new TempoSection (*child); - metrics->push_back (ts); + metrics.push_back (ts); if (ts->bar_offset() < 0.0) { if (last_meter) { @@ -1577,7 +1595,7 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) catch (failed_constructor& err){ error << _("Tempo map: could not set new state, restoring old one.") << endmsg; - *metrics = old_metrics; + metrics = old_metrics; break; } @@ -1585,24 +1603,46 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) try { MeterSection* ms = new MeterSection (*child); - metrics->push_back (ms); + metrics.push_back (ms); last_meter = ms; } catch (failed_constructor& err) { error << _("Tempo map: could not set new state, restoring old one.") << endmsg; - *metrics = old_metrics; + metrics = old_metrics; break; } } } if (niter == nlist.end()) { - MetricSectionSorter cmp; - metrics->sort (cmp); - recompute_map (true); + metrics.sort (cmp); } + + /* check for multiple tempo/meters at the same location, which + ardour2 somehow allowed. + */ + + Metrics::iterator prev = metrics.end(); + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { + if (prev != metrics.end()) { + if (dynamic_cast(*prev) && dynamic_cast(*i)) { + if ((*prev)->start() == (*i)->start()) { + error << string_compose (_("Multiple meter definitions found at %1"), (*prev)->start()) << endmsg; + return -1; + } + } else if (dynamic_cast(*prev) && dynamic_cast(*i)) { + if ((*prev)->start() == (*i)->start()) { + error << string_compose (_("Multiple tempo definitions found at %1"), (*prev)->start()) << endmsg; + return -1; + } + } + } + prev = i; + } + + recompute_map (true, -1); } PropertyChanged (PropertyChange ()); @@ -1613,10 +1653,11 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) void TempoMap::dump (std::ostream& o) const { + Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK); const MeterSection* m; const TempoSection* t; - 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 << " (Bar-offset: " << t->bar_offset() << ") " << t->beats_per_minute() << " BPM (pulse = 1/" << t->note_type() << ") at " << t->start() << " frame= " << t->frame() << " (movable? " @@ -1631,10 +1672,10 @@ TempoMap::dump (std::ostream& o) const int TempoMap::n_tempos() const { - Glib::RWLock::ReaderLock lm (lock); + Glib::Threads::RWLock::ReaderLock lm (lock); int cnt = 0; - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if (dynamic_cast(*i) != 0) { cnt++; } @@ -1646,10 +1687,10 @@ TempoMap::n_tempos() const int TempoMap::n_meters() const { - Glib::RWLock::ReaderLock lm (lock); + Glib::Threads::RWLock::ReaderLock lm (lock); int cnt = 0; - for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) { + for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if (dynamic_cast(*i) != 0) { cnt++; } @@ -1661,234 +1702,95 @@ TempoMap::n_meters() const void TempoMap::insert_time (framepos_t where, framecnt_t amount) { - for (Metrics::iterator i = metrics->begin(); i != metrics->end(); ++i) { - if ((*i)->frame() >= where && (*i)->movable ()) { - (*i)->set_frame ((*i)->frame() + amount); - } - } - - timestamp_metrics_from_audio_time (); - - PropertyChanged (PropertyChange ()); -} - -BBT_Time -TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& other) const -{ - TempoMetric metric = metric_at (start); - return bbt_add (start, other, metric); -} - -/** - * add the BBT interval @param increment to @param start and return the result - */ -BBT_Time -TempoMap::bbt_add (const BBT_Time& start, const BBT_Time& increment, const TempoMetric& /*metric*/) const -{ - BBT_Time result = start; - BBT_Time op = increment; /* argument is const, but we need to modify it */ - uint32_t ticks = result.ticks + op.ticks; - - if (ticks >= BBT_Time::ticks_per_bar_division) { - op.beats++; - result.ticks = ticks % (uint32_t) BBT_Time::ticks_per_bar_division; - } else { - result.ticks += op.ticks; - } - - /* now comes the complicated part. we have to add one beat a time, - checking for a new metric on every beat. - */ - - /* grab all meter sections */ - - list meter_sections; - - for (Metrics::const_iterator x = metrics->begin(); x != metrics->end(); ++x) { - const MeterSection* ms; - if ((ms = dynamic_cast(*x)) != 0) { - meter_sections.push_back (ms); - } - } - - assert (!meter_sections.empty()); - - list::const_iterator next_meter; - const Meter* meter = 0; - - /* go forwards through the meter sections till we get to the one - covering the current value of result. this positions i to point to - the next meter section too, or the end. - */ - - for (next_meter = meter_sections.begin(); next_meter != meter_sections.end(); ++next_meter) { - - if (result < (*next_meter)->start()) { - /* this metric is past the result time. stop looking, we have what we need */ - break; - } - - if (result == (*next_meter)->start()) { - /* this meter section starts at result, push i beyond it so that it points - to the NEXT section, opwise we will get stuck later, and use this meter section. - */ - meter = *next_meter; - ++next_meter; - break; - } - - meter = *next_meter; - } - - assert (meter != 0); - - /* OK, now have the meter for the bar start we are on, and i is an iterator - that points to the metric after the one we are currently dealing with - (or to metrics->end(), of course) - */ - - while (op.beats) { - - /* given the current meter, have we gone past the end of the bar ? */ - - if (result.beats >= meter->divisions_per_bar()) { - /* move to next bar, first beat */ - result.bars++; - result.beats = 1; - } else { - result.beats++; - } - - /* one down ... */ - - op.beats--; - - /* check if we need to use a new meter section: has adding beats to result taken us - to or after the start of the next meter section? in which case, use it. - */ - - if (next_meter != meter_sections.end() && (((*next_meter)->start () < result) || (result == (*next_meter)->start()))) { - meter = *next_meter; - ++next_meter; - } - } - - /* finally, add bars */ - - result.bars += op.bars++; - - return result; -} - -/** - * subtract the BBT interval @param decrement from @param start and return the result - */ -BBT_Time -TempoMap::bbt_subtract (const BBT_Time& start, const BBT_Time& decrement) const -{ - BBT_Time result = start; - BBT_Time op = decrement; /* argument is const, but we need to modify it */ - - if (op.ticks > result.ticks) { - /* subtract an extra beat later; meanwhile set ticks to the right "carry" value */ - op.beats++; - result.ticks = BBT_Time::ticks_per_bar_division - (op.ticks - result.ticks); - } else { - result.ticks -= op.ticks; - } - - /* now comes the complicated part. we have to subtract one beat a time, - checking for a new metric on every beat. - */ - - /* grab all meter sections */ - - list meter_sections; - - for (Metrics::const_iterator x = metrics->begin(); x != metrics->end(); ++x) { - const MeterSection* ms; - if ((ms = dynamic_cast(*x)) != 0) { - meter_sections.push_back (ms); - } - } - - assert (!meter_sections.empty()); - - /* go backwards through the meter sections till we get to the one - covering the current value of result. this positions i to point to - the next (previous) meter section too, or the end. - */ - - const MeterSection* meter = 0; - list::reverse_iterator next_meter; // older versions of GCC don't - // support const_reverse_iterator::operator!=() - - for (next_meter = meter_sections.rbegin(); next_meter != meter_sections.rend(); ++next_meter) { - - /* when we find the first meter section that is before or at result, use it, - and set next_meter to the previous one - */ - - if ((*next_meter)->start() < result || (*next_meter)->start() == result) { - meter = *next_meter; - ++next_meter; - break; - } - } - - assert (meter != 0); - - /* OK, now have the meter for the bar start we are on, and i is an iterator - that points to the metric after the one we are currently dealing with - (or to metrics->end(), of course) - */ - - while (op.beats) { - - /* have we reached the start of the bar? if so, move to the last beat of the previous - bar. opwise, just step back 1 beat. - */ - - if (result.beats == 1) { - - /* move to previous bar, last beat */ - - if (result.bars <= 1) { - /* i'm sorry dave, i can't do that */ - throw std::out_of_range ("illegal BBT subtraction"); + { + Glib::Threads::RWLock::WriterLock lm (lock); + for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { + if ((*i)->frame() >= where && (*i)->movable ()) { + (*i)->set_frame ((*i)->frame() + amount); } - - result.bars--; - result.beats = meter->divisions_per_bar(); - } else { - - /* back one beat */ - - result.beats--; } - /* one down ... */ - op.beats--; - - /* check if we need to use a new meter section: has subtracting beats to result taken us - to before the start of the current meter section? in which case, use the prior one. - */ + /* now reset the BBT time of all metrics, based on their new + * audio time. This is the only place where we do this reverse + * timestamp. + */ - if (result < meter->start() && next_meter != meter_sections.rend()) { - meter = *next_meter; - ++next_meter; + Metrics::iterator i; + const MeterSection* meter; + const TempoSection* tempo; + MeterSection *m; + TempoSection *t; + + meter = &first_meter (); + tempo = &first_tempo (); + + BBT_Time start; + BBT_Time end; + + // cerr << "\n###################### TIMESTAMP via AUDIO ##############\n" << endl; + + bool first = true; + MetricSection* prev = 0; + + for (i = metrics.begin(); i != metrics.end(); ++i) { + + BBT_Time bbt; + TempoMetric metric (*meter, *tempo); + + if (prev) { + metric.set_start (prev->start()); + metric.set_frame (prev->frame()); + } else { + // metric will be at frames=0 bbt=1|1|0 by default + // which is correct for our purpose + } + + BBTPointList::const_iterator bi = bbt_before_or_at ((*i)->frame()); + bbt_time ((*i)->frame(), bbt, bi); + + // cerr << "timestamp @ " << (*i)->frame() << " with " << bbt.bars << "|" << bbt.beats << "|" << bbt.ticks << " => "; + + if (first) { + first = false; + } else { + + if (bbt.ticks > BBT_Time::ticks_per_beat/2) { + /* round up to next beat */ + bbt.beats += 1; + } + + bbt.ticks = 0; + + if (bbt.beats != 1) { + /* round up to next bar */ + bbt.bars += 1; + bbt.beats = 1; + } + } + + // cerr << bbt << endl; + + (*i)->set_start (bbt); + + if ((t = dynamic_cast(*i)) != 0) { + tempo = t; + // cerr << "NEW TEMPO, frame = " << (*i)->frame() << " start = " << (*i)->start() <(*i)) != 0) { + meter = m; + // cerr << "NEW METER, frame = " << (*i)->frame() << " start = " << (*i)->start() <= result.bars) { - /* i'm sorry dave, i can't do that */ - throw std::out_of_range ("illegal BBT subtraction"); - } - result.bars -= op.bars; - return result; + PropertyChanged (PropertyChange ()); } /** Add some (fractional) beats to a session frame position, and return the result in frames. @@ -1897,146 +1799,197 @@ TempoMap::bbt_subtract (const BBT_Time& start, const BBT_Time& decrement) const framepos_t TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const { - Metrics::const_iterator i; - const TempoSection* tempo; + Glib::Threads::RWLock::ReaderLock lm (lock); + Metrics::const_iterator next_tempo; + const TempoSection* tempo = 0; - /* Find the starting tempo */ + /* Find the starting tempo metric */ - for (i = metrics->begin(); i != metrics->end(); ++i) { + for (next_tempo = metrics.begin(); next_tempo != metrics.end(); ++next_tempo) { - /* This is a bit of a hack, but pos could be -ve, and if it is, - we consider the initial metric changes (at time 0) to actually - be in effect at pos. - */ - framepos_t f = (*i)->frame (); - if (pos < 0 && f == 0) { - f = pos; - } + const TempoSection* t; - if (f > pos) { - break; - } + if ((t = dynamic_cast(*next_tempo)) != 0) { - const TempoSection* t; + /* This is a bit of a hack, but pos could be -ve, and if it is, + we consider the initial metric changes (at time 0) to actually + be in effect at pos. + */ - if ((t = dynamic_cast(*i)) != 0) { + framepos_t f = (*next_tempo)->frame (); + + if (pos < 0 && f == 0) { + f = pos; + } + + if (f > pos) { + break; + } + tempo = t; } } /* We now have: - tempo -> the Tempo for "pos" - i -> for first new metric after "pos", possibly metrics->end() + tempo -> the Tempo for "pos" + next_tempo -> first tempo after "pos", possibly metrics.end() */ + DEBUG_TRACE (DEBUG::TempoMath, + string_compose ("frame %1 plus %2 beats, start with tempo = %3 @ %4\n", + pos, beats, *((const Tempo*)tempo), tempo->frame())); + while (beats) { /* Distance to the end of this section in frames */ - framecnt_t distance_frames = i == metrics->end() ? max_framepos : ((*i)->frame() - pos); + framecnt_t distance_frames = (next_tempo == metrics.end() ? max_framepos : ((*next_tempo)->frame() - pos)); /* Distance to the end in beats */ Evoral::MusicalTime distance_beats = distance_frames / tempo->frames_per_beat (_frame_rate); /* Amount to subtract this time */ - double const sub = min (distance_beats, beats); + double const delta = min (distance_beats, beats); + + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tdistance to %1 = %2 (%3 beats)\n", + (next_tempo == metrics.end() ? max_framepos : (*next_tempo)->frame()), + distance_frames, distance_beats)); /* Update */ - beats -= sub; - pos += sub * tempo->frames_per_beat (_frame_rate); + beats -= delta; + pos += delta * tempo->frames_per_beat (_frame_rate); - /* Move on if there's anything to move to */ - if (i != metrics->end ()) { - const TempoSection* t; - - if ((t = dynamic_cast(*i)) != 0) { - tempo = t; - } + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnow at %1, %2 beats left\n", pos, beats)); - ++i; + /* step forwards to next tempo section */ + + if (next_tempo != metrics.end()) { + + tempo = dynamic_cast(*next_tempo); + + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n", + *((const Tempo*)tempo), tempo->frame(), + tempo->frames_per_beat (_frame_rate))); + + while (next_tempo != metrics.end ()) { + + ++next_tempo; + + if (next_tempo != metrics.end() && dynamic_cast(*next_tempo)) { + break; + } + } } } return pos; } -/** Subtract some (fractional) beats to a frame position, and return the result in frames */ +/** Subtract some (fractional) beats from a frame position, and return the result in frames */ framepos_t TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const { - Metrics::const_iterator i; + Glib::Threads::RWLock::ReaderLock lm (lock); + Metrics::const_reverse_iterator prev_tempo; const TempoSection* tempo = 0; - const TempoSection* t; - - /* Find the starting tempo */ - for (i = metrics->begin(); i != metrics->end(); ++i) { + /* Find the starting tempo metric */ - /* This is a bit of a hack, but pos could be -ve, and if it is, - we consider the initial metric changes (at time 0) to actually - be in effect at pos. - */ - framepos_t f = (*i)->frame (); - if (pos < 0 && f == 0) { - f = pos; - } + for (prev_tempo = metrics.rbegin(); prev_tempo != metrics.rend(); ++prev_tempo) { - if ((*i)->frame() > pos) { - break; - } + const TempoSection* t; - if ((t = dynamic_cast(*i)) != 0) { - tempo = t; - } - } + if ((t = dynamic_cast(*prev_tempo)) != 0) { + + /* This is a bit of a hack, but pos could be -ve, and if it is, + we consider the initial metric changes (at time 0) to actually + be in effect at pos. + */ - bool no_more_tempos = false; + framepos_t f = (*prev_tempo)->frame (); - /* Move i back to the tempo before "pos" */ - if (i != metrics->begin ()) { - while (i != metrics->begin ()) { - --i; - t = dynamic_cast (*i); - if (t) { - break; + if (pos < 0 && f == 0) { + f = pos; + } + + /* this is slightly more complex than the forward case + because we reach the tempo in effect at pos after + passing through pos (rather before, as in the + forward case). having done that, we then need to + keep going to get the previous tempo (or + metrics.rend()) + */ + + if (f <= pos) { + if (tempo == 0) { + /* first tempo with position at or + before pos + */ + tempo = t; + } else if (f < pos) { + /* some other tempo section that + is even earlier than 'tempo' + */ + break; + } } } - } else { - no_more_tempos = true; } + DEBUG_TRACE (DEBUG::TempoMath, + string_compose ("frame %1 minus %2 beats, start with tempo = %3 @ %4 prev at beg? %5\n", + pos, beats, *((const Tempo*)tempo), tempo->frame(), + prev_tempo == metrics.rend())); + /* We now have: - tempo -> the Tempo for "pos" - i -> the first metric before "pos", unless no_more_tempos is true + tempo -> the Tempo for "pos" + prev_tempo -> the first metric before "pos", possibly metrics.rend() */ while (beats) { + + /* Distance to the start of this section in frames */ + framecnt_t distance_frames = (pos - tempo->frame()); - /* Distance to the end of this section in frames */ - framecnt_t distance_frames = no_more_tempos ? max_framepos : (pos - (*i)->frame()); - - /* Distance to the end in beats */ + /* Distance to the start in beats */ Evoral::MusicalTime distance_beats = distance_frames / tempo->frames_per_beat (_frame_rate); /* Amount to subtract this time */ double const sub = min (distance_beats, beats); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tdistance to %1 = %2 (%3 beats)\n", + tempo->frame(), distance_frames, distance_beats)); /* Update */ + beats -= sub; pos -= sub * tempo->frames_per_beat (_frame_rate); - /* Move i and tempo back, if there's anything to move to */ - if (i != metrics->begin ()) { - while (i != metrics->begin ()) { - --i; - if ((t = dynamic_cast(*i)) != 0) { - tempo = t; + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("\tnow at %1, %2 beats left, prev at end ? %3\n", pos, beats, + (prev_tempo == metrics.rend()))); + + /* step backwards to prior TempoSection */ + + if (prev_tempo != metrics.rend()) { + + tempo = dynamic_cast(*prev_tempo); + + DEBUG_TRACE (DEBUG::TempoMath, + string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n", + *((const Tempo*)tempo), tempo->frame(), + tempo->frames_per_beat (_frame_rate))); + + while (prev_tempo != metrics.rend ()) { + + ++prev_tempo; + + if (prev_tempo != metrics.rend() && dynamic_cast(*prev_tempo) != 0) { break; } } } else { - no_more_tempos = true; + pos -= llrint (beats * tempo->frames_per_beat (_frame_rate)); + beats = 0; } } @@ -2047,12 +2000,14 @@ TempoMap::framepos_minus_beats (framepos_t pos, Evoral::MusicalTime beats) const framepos_t TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const { + Glib::Threads::RWLock::ReaderLock lm (lock); Metrics::const_iterator i; const MeterSection* meter; const MeterSection* m; const TempoSection* tempo; const TempoSection* t; double frames_per_beat; + framepos_t effective_pos = max (pos, (framepos_t) 0); meter = &first_meter (); tempo = &first_tempo (); @@ -2062,9 +2017,9 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const /* find the starting metrics for tempo & meter */ - for (i = metrics->begin(); i != metrics->end(); ++i) { + for (i = metrics.begin(); i != metrics.end(); ++i) { - if ((*i)->frame() > pos) { + if ((*i)->frame() > effective_pos) { break; } @@ -2079,7 +2034,7 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const meter -> the Meter for "pos" tempo -> the Tempo for "pos" - i -> for first new metric after "pos", possibly metrics->end() + i -> for first new metric after "pos", possibly metrics.end() */ /* now comes the complicated part. we have to add one beat a time, @@ -2099,7 +2054,7 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const to or after the start of the next metric section? in which case, use it. */ - if (i != metrics->end()) { + if (i != metrics.end()) { if ((*i)->frame() <= pos) { /* about to change tempo or meter, so add the @@ -2139,7 +2094,7 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const to or after the start of the next metric section? in which case, use it. */ - if (i != metrics->end()) { + if (i != metrics.end()) { if ((*i)->frame() <= pos) { /* about to change tempo or meter, so add the @@ -2165,12 +2120,12 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const pos += llrint (beats * frames_per_beat); if (op.ticks) { - if (op.ticks >= BBT_Time::ticks_per_bar_division) { + if (op.ticks >= BBT_Time::ticks_per_beat) { pos += llrint (frames_per_beat + /* extra beat */ - (frames_per_beat * ((op.ticks % (uint32_t) BBT_Time::ticks_per_bar_division) / - (double) BBT_Time::ticks_per_bar_division))); + (frames_per_beat * ((op.ticks % (uint32_t) BBT_Time::ticks_per_beat) / + (double) BBT_Time::ticks_per_beat))); } else { - pos += llrint (frames_per_beat * (op.ticks / (double) BBT_Time::ticks_per_bar_division)); + pos += llrint (frames_per_beat * (op.ticks / (double) BBT_Time::ticks_per_beat)); } } @@ -2183,95 +2138,167 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const Evoral::MusicalTime TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const { - Metrics::const_iterator i; + Glib::Threads::RWLock::ReaderLock lm (lock); + Metrics::const_iterator next_tempo; const TempoSection* tempo = 0; - - /* Find the starting tempo */ + framepos_t effective_pos = max (pos, (framepos_t) 0); - for (i = metrics->begin(); i != metrics->end(); ++i) { + /* Find the relevant initial tempo metric */ - if ((*i)->frame() > pos) { - break; - } + for (next_tempo = metrics.begin(); next_tempo != metrics.end(); ++next_tempo) { const TempoSection* t; - if ((t = dynamic_cast(*i)) != 0) { + if ((t = dynamic_cast(*next_tempo)) != 0) { + + if ((*next_tempo)->frame() > effective_pos) { + break; + } + tempo = t; } } - assert (tempo); - /* We now have: tempo -> the Tempo for "pos" - i -> the first metric after "pos", possibly metrics->end() + next_tempo -> the next tempo after "pos", possibly metrics.end() */ + assert (tempo); + + DEBUG_TRACE (DEBUG::TempoMath, + string_compose ("frame %1 walk by %2 frames, start with tempo = %3 @ %4\n", + pos, distance, *((const Tempo*)tempo), tempo->frame())); + Evoral::MusicalTime beats = 0; while (distance) { /* End of this section */ - framepos_t const end = i == metrics->end() ? max_framepos : (*i)->frame (); - - /* Distance to the end in frames */ - framecnt_t const distance_to_end = end - pos; + framepos_t end; + /* Distance to `end' in frames */ + framepos_t distance_to_end; + + if (next_tempo == metrics.end ()) { + /* We can't do (end - pos) if end is max_framepos, as it will overflow if pos is -ve */ + end = max_framepos; + distance_to_end = max_framepos; + } else { + end = (*next_tempo)->frame (); + distance_to_end = end - pos; + } /* Amount to subtract this time */ double const sub = min (distance, distance_to_end); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("to reach end at %1 (end ? %2), distance= %3 sub=%4\n", end, (next_tempo == metrics.end()), + distance_to_end, sub)); + /* Update */ pos += sub; distance -= sub; + assert (tempo); beats += sub / tempo->frames_per_beat (_frame_rate); + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("now at %1, beats = %2 distance left %3\n", + pos, beats, distance)); + /* Move on if there's anything to move to */ - if (i != metrics->end ()) { - const TempoSection* t; - - if ((t = dynamic_cast(*i)) != 0) { - tempo = t; + + if (next_tempo != metrics.end()) { + + tempo = dynamic_cast(*next_tempo); + + DEBUG_TRACE (DEBUG::TempoMath, + string_compose ("\tnew tempo = %1 @ %2 fpb = %3\n", + *((const Tempo*)tempo), tempo->frame(), + tempo->frames_per_beat (_frame_rate))); + + while (next_tempo != metrics.end ()) { + + ++next_tempo; + + if (next_tempo != metrics.end() && dynamic_cast(*next_tempo)) { + break; + } + } + + if (next_tempo == metrics.end()) { + DEBUG_TRACE (DEBUG::TempoMath, "no more tempo sections\n"); + } else { + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("next tempo section is %1 @ %2\n", + **next_tempo, (*next_tempo)->frame())); } - ++i; } + assert (tempo); } return beats; } -/** Compare the time of this with that of another MetricSection. - * @param with_bbt True to compare using start(), false to use frame(). - * @return -1 for less than, 0 for equal, 1 for greater than. - */ - -int -MetricSection::compare (const MetricSection& other) const +TempoMap::BBTPointList::const_iterator +TempoMap::bbt_before_or_at (framepos_t pos) { - if (start() == other.start()) { - return 0; - } else if (start() < other.start()) { - return -1; - } else { - return 1; + /* CALLER MUST HOLD READ LOCK */ + + BBTPointList::const_iterator i; + + if (pos < 0) { + /* not really correct, but we should catch pos < 0 at a higher + level + */ + return _map.begin(); } - /* NOTREACHED */ - return 0; + i = lower_bound (_map.begin(), _map.end(), pos); + assert (i != _map.end()); + if ((*i).frame > pos) { + assert (i != _map.begin()); + --i; + } + return i; } -bool -MetricSection::operator== (const MetricSection& other) const +struct bbtcmp { + bool operator() (const BBT_Time& a, const BBT_Time& b) { + return a < b; + } +}; + +TempoMap::BBTPointList::const_iterator +TempoMap::bbt_before_or_at (const BBT_Time& bbt) { - return compare (other) == 0; + BBTPointList::const_iterator i; + bbtcmp cmp; + + i = lower_bound (_map.begin(), _map.end(), bbt, cmp); + assert (i != _map.end()); + if ((*i).bar > bbt.bars || (*i).beat > bbt.beats) { + assert (i != _map.begin()); + --i; + } + return i; } -bool -MetricSection::operator!= (const MetricSection& other) const +TempoMap::BBTPointList::const_iterator +TempoMap::bbt_after_or_at (framepos_t pos) { - return compare (other) != 0; + /* CALLER MUST HOLD READ LOCK */ + + BBTPointList::const_iterator i; + + if (_map.back().frame == pos) { + i = _map.end(); + assert (i != _map.begin()); + --i; + return i; + } + + i = upper_bound (_map.begin(), _map.end(), pos); + assert (i != _map.end()); + return i; } std::ostream& @@ -2293,9 +2320,9 @@ operator<< (std::ostream& o, const MetricSection& section) { const MeterSection* ms; if ((ts = dynamic_cast (§ion)) != 0) { - o << *((Tempo*) ts); + o << *((const Tempo*) ts); } else if ((ms = dynamic_cast (§ion)) != 0) { - o << *((Meter*) ms); + o << *((const Meter*) ms); } return o;