#include <algorithm>
#include <stdexcept>
+#include <cmath>
#include <unistd.h>
-#include <cmath>
-
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#include "pbd/xml++.h"
-#include "evoral/types.hpp"
+#include "evoral/Beats.hpp"
#include "ardour/debug.h"
+#include "ardour/lmath.h"
#include "ardour/tempo.h"
-#include "ardour/utils.h"
#include "i18n.h"
#include <locale.h>
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
+double
+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;
}
/***********************************************************************/
{
const XMLProperty *prop;
BBT_Time start;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
if ((prop = node.property ("start")) == 0) {
error << _("TempoSection XML node has no \"start\" property") << endmsg;
{
XMLNode *root = new XMLNode (xml_state_node_name);
char buf[256];
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
start().bars,
TempoSection::update_bar_offset_from_bbt (const Meter& m)
{
- _bar_offset = ((double) (start().beats - 1) + (start().ticks/Timecode::BBT_Time::ticks_per_bar_division)) /
- (m.divisions_per_bar() - 1);
+ _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()));
}
}
new_start.bars = start().bars;
-
- double ticks = BBT_Time::ticks_per_bar_division * (_bar_offset * (meter.divisions_per_bar() - 1));
- 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);
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("from bar offset %1 and dpb %2, ticks = %3->%4 beats = %5\n",
- _bar_offset, meter.divisions_per_bar(), ticks, new_start.ticks, new_start.beats));
+ 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;
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("tempo updated BBT time to %1 from bar offset %2 w/dpb = %3\n", new_start, _bar_offset, meter.divisions_per_bar()));
-
+
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("from bar offset %1 and dpb %2, ticks = %3->%4 beats = %5\n",
+ _bar_offset, meter.divisions_per_bar(), ticks, new_start.ticks, new_start.beats));
+
set_start (new_start);
}
{
const XMLProperty *prop;
BBT_Time start;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
if ((prop = node.property ("start")) == 0) {
error << _("MeterSection XML node has no \"start\" property") << endmsg;
if ((prop = node.property ("beats-per-bar")) == 0) {
error << _("MeterSection XML node has no \"beats-per-bar\" or \"divisions-per-bar\" property") << endmsg;
throw failed_constructor();
- }
+ }
}
if (sscanf (prop->value().c_str(), "%lf", &_divisions_per_bar) != 1 || _divisions_per_bar < 0.0) {
{
XMLNode *root = new XMLNode (xml_state_node_name);
char buf[256];
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg (X_("C"));
snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
start().bars,
TempoMap::TempoMap (framecnt_t fr)
{
- metrics = new Metrics;
_frame_rate = fr;
- last_bbt_valid = false;
BBT_Time start;
start.bars = 1;
/* 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 ()
}
void
-TempoMap::remove_tempo (const TempoSection& tempo, bool send_signal)
+TempoMap::remove_tempo (const TempoSection& tempo, bool complete_operation)
{
bool removed = false;
{
- Glib::RWLock::WriterLock lm (lock);
- Metrics::iterator i;
-
- for (i = metrics->begin(); i != metrics->end(); ++i) {
- if (dynamic_cast<TempoSection*> (*i) != 0) {
- if (tempo.frame() == (*i)->frame()) {
- if ((*i)->movable()) {
- metrics->erase (i);
- removed = true;
- break;
- }
- }
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ if ((removed = remove_tempo_locked (tempo))) {
+ if (complete_operation) {
+ recompute_map (true);
}
}
}
- if (removed) {
- timestamp_metrics (false);
- if (send_signal) {
- PropertyChanged (PropertyChange ());
+ if (removed && complete_operation) {
+ PropertyChanged (PropertyChange ());
+ }
+}
+
+bool
+TempoMap::remove_tempo_locked (const TempoSection& tempo)
+{
+ Metrics::iterator i;
+
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
+ if (dynamic_cast<TempoSection*> (*i) != 0) {
+ if (tempo.frame() == (*i)->frame()) {
+ if ((*i)->movable()) {
+ metrics.erase (i);
+ return true;
+ }
+ }
}
}
+
+ return false;
}
void
-TempoMap::remove_meter (const MeterSection& tempo, bool send_signal)
+TempoMap::remove_meter (const MeterSection& tempo, bool complete_operation)
{
bool removed = false;
{
- Glib::RWLock::WriterLock lm (lock);
- Metrics::iterator i;
-
- for (i = metrics->begin(); i != metrics->end(); ++i) {
- if (dynamic_cast<MeterSection*> (*i) != 0) {
- if (tempo.frame() == (*i)->frame()) {
- if ((*i)->movable()) {
- metrics->erase (i);
- removed = true;
- break;
- }
- }
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ if ((removed = remove_meter_locked (tempo))) {
+ if (complete_operation) {
+ recompute_map (true);
}
}
}
- if (removed) {
- timestamp_metrics (true);
- if (send_signal) {
- PropertyChanged (PropertyChange ());
+ if (removed && complete_operation) {
+ PropertyChanged (PropertyChange ());
+ }
+}
+
+bool
+TempoMap::remove_meter_locked (const MeterSection& tempo)
+{
+ Metrics::iterator i;
+
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
+ if (dynamic_cast<MeterSection*> (*i) != 0) {
+ if (tempo.frame() == (*i)->frame()) {
+ if ((*i)->movable()) {
+ metrics.erase (i);
+ return true;
+ }
+ }
}
}
+
+ return false;
}
void
TempoMap::do_insert (MetricSection* section)
{
- bool reassign_tempo_bbt = false;
+ bool need_add = true;
assert (section->start().ticks == 0);
/* we only allow new meters to be inserted on beat 1 of an existing
- * measure.
+ * measure.
*/
if (dynamic_cast<MeterSection*>(section)) {
/* we need to (potentially) update the BBT times of tempo
sections based on this new meter.
*/
-
- reassign_tempo_bbt = true;
if ((section->start().beats != 1) || (section->start().ticks != 0)) {
-
+
BBT_Time corrected = section->start();
corrected.beats = 1;
corrected.ticks = 0;
-
+
warning << string_compose (_("Meter changes can only be positioned on the first beat of a bar. Moving from %1 to %2"),
section->start(), corrected) << endmsg;
-
+
section->set_start (corrected);
}
}
- 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<TempoSection*> (*i) != 0;
+ bool const insert_is_tempo = dynamic_cast<TempoSection*> (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<TempoSection*> (*i) != 0;
- bool const b = dynamic_cast<TempoSection*> (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<Tempo*>(*i)) = *(dynamic_cast<Tempo*>(section));
+ need_add = false;
+ } else {
+ metrics.erase (i);
+ }
+ break;
+ }
+
+ } else if (!iter_is_tempo && !insert_is_tempo) {
+
+ /* Meter Sections */
+
+ if ((*i)->start().bars == section->start().bars) {
+
+ if (!(*i)->movable()) {
+
+ /* can't (re)move this section, so overwrite
+ * its data content (but not its properties as
+ * a section
+ */
+
+ *(dynamic_cast<Meter*>(*i)) = *(dynamic_cast<Meter*>(section));
+ need_add = false;
+ } else {
+ metrics.erase (i);
+
+ }
+
+ break;
+ }
+ } else {
+ /* non-matching types, so we don't care */
}
}
- if (to_remove != metrics->end()) {
- /* remove the MetricSection at the same time as the one we are about to add */
- metrics->erase (to_remove);
- }
+ /* Add the given MetricSection, if we didn't just reset an existing
+ * one above
+ */
- /* Add the given MetricSection */
+ if (need_add) {
- for (i = metrics->begin(); i != metrics->end(); ++i) {
+ Metrics::iterator i;
- if ((*i)->compare (*section) < 0) {
- continue;
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
+ if ((*i)->start() > section->start()) {
+ break;
+ }
}
- metrics->insert (i, section);
- break;
- }
-
- if (i == metrics->end()) {
- metrics->insert (metrics->end(), section);
+ metrics.insert (i, section);
}
-
- timestamp_metrics (reassign_tempo_bbt);
}
void
TempoMap::replace_tempo (const TempoSection& ts, const Tempo& tempo, const BBT_Time& where)
{
- const TempoSection& first (first_tempo());
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ TempoSection& first (first_tempo());
- if (ts != first) {
- remove_tempo (ts, false);
- add_tempo (tempo, where);
- } else {
- /* cannot move the first tempo section */
- *((Tempo*)&first) = tempo;
- timestamp_metrics (false);
+ if (ts.start() != first.start()) {
+ remove_tempo_locked (ts);
+ add_tempo_locked (tempo, where, true);
+ } else {
+ {
+ /* cannot move the first tempo section */
+ *static_cast<Tempo*>(&first) = tempo;
+ recompute_map (false);
+ }
+ }
}
PropertyChanged (PropertyChange ());
TempoMap::add_tempo (const Tempo& tempo, BBT_Time where)
{
{
- Glib::RWLock::WriterLock lm (lock);
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ add_tempo_locked (tempo, where, true);
+ }
- /* new tempos always start on a beat */
- where.ticks = 0;
- TempoSection* ts = new TempoSection (where, tempo.beats_per_minute(), tempo.note_type());
-
- /* find the meter to use to set the bar offset of this
- * tempo section.
- */
+ PropertyChanged (PropertyChange ());
+}
- const Meter* meter = &first_meter();
-
- /* as we start, we are *guaranteed* to have m.meter and m.tempo pointing
- at something, because we insert the default tempo and meter during
- TempoMap construction.
-
- now see if we can find better candidates.
- */
-
- for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) {
-
- const MeterSection* m;
-
- if (where < (*i)->start()) {
- break;
- }
-
- if ((m = dynamic_cast<const MeterSection*>(*i)) != 0) {
- meter = m;
- }
- }
+void
+TempoMap::add_tempo_locked (const Tempo& tempo, BBT_Time where, bool recompute)
+{
+ /* new tempos always start on a beat */
+ where.ticks = 0;
+
+ TempoSection* ts = new TempoSection (where, tempo.beats_per_minute(), tempo.note_type());
+
+ /* find the meter to use to set the bar offset of this
+ * tempo section.
+ */
+
+ const Meter* meter = &first_meter();
- ts->update_bar_offset_from_bbt (*meter);
+ /* as we start, we are *guaranteed* to have m.meter and m.tempo pointing
+ at something, because we insert the default tempo and meter during
+ TempoMap construction.
+
+ now see if we can find better candidates.
+ */
+
+ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
- /* and insert it */
+ const MeterSection* m;
+
+ if (where < (*i)->start()) {
+ break;
+ }
- do_insert (ts);
+ if ((m = dynamic_cast<const MeterSection*>(*i)) != 0) {
+ meter = m;
+ }
}
- PropertyChanged (PropertyChange ());
+ ts->update_bar_offset_from_bbt (*meter);
+
+ /* and insert it */
+
+ do_insert (ts);
+
+ if (recompute) {
+ recompute_map (false);
+ }
}
void
TempoMap::replace_meter (const MeterSection& ms, const Meter& meter, const BBT_Time& where)
{
- const MeterSection& first (first_meter());
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ MeterSection& first (first_meter());
- if (ms != first) {
- remove_meter (ms, false);
- add_meter (meter, where);
- } else {
- /* cannot move the first meter section */
- *((Meter*)&first) = meter;
- timestamp_metrics (true);
+ if (ms.start() != first.start()) {
+ remove_meter_locked (ms);
+ add_meter_locked (meter, where, true);
+ } else {
+ /* cannot move the first meter section */
+ *static_cast<Meter*>(&first) = meter;
+ recompute_map (true);
+ }
}
PropertyChanged (PropertyChange ());
TempoMap::add_meter (const Meter& meter, BBT_Time where)
{
{
- Glib::RWLock::WriterLock lm (lock);
-
- /* a new meter always starts a new bar on the first beat. so
- round the start time appropriately. remember that
- `where' is based on the existing tempo map, not
- the result after we insert the new meter.
-
- */
-
- if (where.beats != 1) {
- where.beats = 1;
- where.bars++;
- }
-
- /* new meters *always* start on a beat. */
- where.ticks = 0;
-
- do_insert (new MeterSection (where, meter.divisions_per_bar(), meter.note_divisor()));
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ add_meter_locked (meter, where, true);
}
+
#ifndef NDEBUG
if (DEBUG_ENABLED(DEBUG::TempoMap)) {
dump (std::cerr);
PropertyChanged (PropertyChange ());
}
+void
+TempoMap::add_meter_locked (const Meter& meter, BBT_Time where, bool recompute)
+{
+ /* a new meter always starts a new bar on the first beat. so
+ round the start time appropriately. remember that
+ `where' is based on the existing tempo map, not
+ the result after we insert the new meter.
+
+ */
+
+ if (where.beats != 1) {
+ where.beats = 1;
+ where.bars++;
+ }
+
+ /* new meters *always* start on a beat. */
+ where.ticks = 0;
+
+ do_insert (new MeterSection (where, meter.divisions_per_bar(), meter.note_divisor()));
+
+ if (recompute) {
+ recompute_map (true);
+ }
+
+}
+
void
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<TempoSection*> (*i)) != 0) {
- *((Tempo*) t) = newtempo;
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ *((Tempo*) t) = newtempo;
+ recompute_map (false);
+ }
PropertyChanged (PropertyChange ());
break;
}
/* 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;
/* reset */
- *((Tempo*)prev) = newtempo;
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ /* cannot move the first tempo section */
+ *((Tempo*)prev) = newtempo;
+ recompute_map (false);
+ }
+
PropertyChanged (PropertyChange ());
}
{
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<const MeterSection *> (*i)) != 0) {
return *m;
}
}
fatal << _("programming error: no tempo section in tempo map!") << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
+ return *m;
+}
+
+MeterSection&
+TempoMap::first_meter ()
+{
+ MeterSection *m = 0;
+
+ /* CALLER MUST HOLD LOCK */
+
+ for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
+ if ((m = dynamic_cast<MeterSection *> (*i)) != 0) {
+ return *m;
+ }
+ }
+
+ fatal << _("programming error: no tempo section in tempo map!") << endmsg;
+ abort(); /*NOTREACHED*/
return *m;
}
{
const TempoSection *t = 0;
- for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) {
+ /* CALLER MUST HOLD LOCK */
+
+ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
if ((t = dynamic_cast<const TempoSection *> (*i)) != 0) {
return *t;
}
}
fatal << _("programming error: no tempo section in tempo map!") << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
return *t;
}
-void
-TempoMap::timestamp_metrics_from_audio_time ()
+TempoSection&
+TempoMap::first_tempo ()
{
- Metrics::iterator i;
- const MeterSection* meter;
- const TempoSection* tempo;
- MeterSection *m;
- TempoSection *t;
+ TempoSection *t = 0;
- meter = &first_meter ();
- tempo = &first_tempo ();
+ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
+ if ((t = dynamic_cast<TempoSection *> (*i)) != 0) {
+ return *t;
+ }
+ }
- BBT_Time start;
- BBT_Time end;
-
- // cerr << "\n###################### TIMESTAMP via AUDIO ##############\n" << endl;
+ fatal << _("programming error: no tempo section in tempo map!") << endmsg;
+ abort(); /*NOTREACHED*/
+ return *t;
+}
+
+void
+TempoMap::require_map_to (framepos_t pos)
+{
+ Glib::Threads::RWLock::WriterLock lm (lock);
- bool first = true;
- MetricSection* prev = 0;
+ if (_map.empty() || _map.back().frame < pos) {
+ extend_map (pos);
+ }
+}
- for (i = metrics->begin(); i != metrics->end(); ++i) {
+void
+TempoMap::require_map_to (const BBT_Time& bbt)
+{
+ Glib::Threads::RWLock::WriterLock lm (lock);
- BBT_Time bbt;
- TempoMetric metric (*meter, *tempo);
+ /* 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.
+ */
- 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
+ int additional_minutes = 1;
+
+ while (1) {
+ if (!_map.empty() && _map.back().bar >= (bbt.bars + 1)) {
+ break;
}
+ /* add some more distance, using bigger steps each time */
+ extend_map (_map.back().frame + (_frame_rate * 60 * additional_minutes));
+ additional_minutes *= 2;
+ }
+}
- bbt_time_with_metric ((*i)->frame(), bbt, metric);
-
- // cerr << "timestamp @ " << (*i)->frame() << " with " << bbt.bars << "|" << bbt.beats << "|" << bbt.ticks << " => ";
+void
+TempoMap::recompute_map (bool reassign_tempo_bbt, framepos_t end)
+{
+ /* CALLER MUST HOLD WRITE LOCK */
- if (first) {
- first = false;
- } else {
+ MeterSection* meter = 0;
+ TempoSection* tempo = 0;
+ double current_frame;
+ BBT_Time current;
+ Metrics::iterator next_metric;
- if (bbt.ticks > BBT_Time::ticks_per_bar_division/2) {
- /* round up to next beat */
- bbt.beats += 1;
- }
+ if (end < 0) {
- bbt.ticks = 0;
+ /* we will actually stop once we hit
+ the last metric.
+ */
+ end = max_framepos;
- if (bbt.beats != 1) {
- /* round up to next bar */
- bbt.bars += 1;
- bbt.beats = 1;
- }
+ } else {
+ if (!_map.empty ()) {
+ /* never allow the map to be shortened */
+ end = max (end, _map.back().frame);
}
+ }
- // cerr << bbt << endl;
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("recomputing tempo map, zero to %1\n", end));
- (*i)->set_start (bbt);
-
- if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
- tempo = t;
- // cerr << "NEW TEMPO, frame = " << (*i)->frame() << " start = " << (*i)->start() <<endl;
- } else if ((m = dynamic_cast<MeterSection*>(*i)) != 0) {
- meter = m;
- // cerr << "NEW METER, frame = " << (*i)->frame() << " start = " << (*i)->start() <<endl;
- } else {
- fatal << _("programming error: unhandled MetricSection type") << endmsg;
- /*NOTREACHED*/
- }
+ for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
+ MeterSection* ms;
- prev = (*i);
+ if ((ms = dynamic_cast<MeterSection *> (*i)) != 0) {
+ meter = ms;
+ break;
+ }
}
-#ifndef NDEBUG
- if (DEBUG_ENABLED(DEBUG::TempoMap)) {
- dump (cerr);
+ assert(meter);
+
+ for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
+ TempoSection* ts;
+
+ if ((ts = dynamic_cast<TempoSection *> (*i)) != 0) {
+ tempo = ts;
+ break;
+ }
}
-#endif
-}
+ assert(tempo);
-void
-TempoMap::timestamp_metrics (bool reassign_tempo_bbt)
-{
- Metrics::iterator i;
- const MeterSection* meter;
- const TempoSection* tempo;
- MeterSection *m;
- TempoSection *t;
+ /* assumes that the first meter & tempo are at frame zero */
+ current_frame = 0;
+ meter->set_frame (0);
+ tempo->set_frame (0);
+
+ /* assumes that the first meter & tempo are at 1|1|0 */
+ current.bars = 1;
+ current.beats = 1;
+ current.ticks = 0;
- DEBUG_TRACE (DEBUG::TempoMath, "###################### TIMESTAMP via BBT ##############\n");
-
- framepos_t current = 0;
- framepos_t section_frames;
- BBT_Time start;
- BBT_Time end;
-
if (reassign_tempo_bbt) {
+ MeterSection* rmeter = meter;
+
DEBUG_TRACE (DEBUG::TempoMath, "\tUpdating tempo marks BBT time from bar offset\n");
- meter = &first_meter ();
- tempo = &first_tempo ();
+ for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
- for (i = metrics->begin(); i != metrics->end(); ++i) {
-
- if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
+ TempoSection* ts;
+ MeterSection* ms;
+
+ if ((ts = dynamic_cast<TempoSection*>(*i)) != 0) {
/* reassign the BBT time of this tempo section
* based on its bar offset position.
*/
- t->update_bbt_time_from_bar_offset (*meter);
- tempo = t;
+ ts->update_bbt_time_from_bar_offset (*rmeter);
- } else if ((m = dynamic_cast<MeterSection*>(*i)) != 0) {
- meter = m;
+ } else if ((ms = dynamic_cast<MeterSection*>(*i)) != 0) {
+ rmeter = ms;
} else {
fatal << _("programming error: unhandled MetricSection type") << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
}
}
}
- meter = &first_meter ();
- tempo = &first_tempo ();
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("start with meter = %1 tempo = %2\n", *((Meter*)meter), *((Tempo*)tempo)));
- for (i = metrics->begin(); i != metrics->end(); ++i) {
+ next_metric = metrics.begin();
+ ++next_metric; // skip meter (or tempo)
+ ++next_metric; // skip tempo (or meter)
- end = (*i)->start();
-
- section_frames = count_frames_between_metrics (*meter, *tempo, start, end);
- current += section_frames;
+ _map.clear ();
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("frames between %1 & %2 = %3 using %4 & %6 puts %7 at %8\n",
- start, end, section_frames,
- *((Meter*) meter), *((Tempo*) tempo),
- (*i)->start(), current));
+ 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), 1, 1));
- start = end;
+ if (end == 0) {
+ /* silly call from Session::process() during startup
+ */
+ return;
+ }
- (*i)->set_frame (current);
+ _extend_map (tempo, meter, next_metric, current, current_frame, end);
+}
- if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
- tempo = t;
- } else if ((m = dynamic_cast<MeterSection*>(*i)) != 0) {
- meter = m;
- } else {
- fatal << _("programming error: unhandled MetricSection type") << endmsg;
- /*NOTREACHED*/
- }
+void
+TempoMap::extend_map (framepos_t end)
+{
+ /* CALLER MUST HOLD WRITE LOCK */
+ if (_map.empty()) {
+ recompute_map (false, end);
+ return;
}
-#ifndef NDEBUG
- if (DEBUG_ENABLED(DEBUG::TempoMath)) {
- dump (cerr);
+ 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;
+ }
}
-#endif
- DEBUG_TRACE (DEBUG::TempoMath, "###############################################\n");
+ /* 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<TempoSection*> ((*i).tempo),
+ const_cast<MeterSection*> ((*i).meter),
+ next_metric, BBT_Time ((*i).bar, (*i).beat, 0), (*i).frame, end);
}
-TempoMetric
-TempoMap::metric_at (framepos_t frame) const
+void
+TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
+ Metrics::iterator next_metric,
+ BBT_Time current, framepos_t current_frame, framepos_t end)
{
- TempoMetric m (first_meter(), first_tempo());
- const Meter* meter;
- const Tempo* tempo;
+ /* CALLER MUST HOLD WRITE LOCK */
- /* 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
- TempoMap construction.
+ TempoSection* ts;
+ MeterSection* ms;
+ double beat_frames;
+ double current_frame_exact;
+ framepos_t bar_start_frame;
- now see if we can find better candidates.
- */
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Extend map to %1 from %2 = %3\n", end, current, current_frame));
- for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) {
+ if (current.beats == 1) {
+ bar_start_frame = current_frame;
+ } else {
+ bar_start_frame = 0;
+ }
- // cerr << "Looking at a metric section " << **i << endl;
+ beat_frames = meter->frames_per_grid (*tempo,_frame_rate);
+ current_frame_exact = current_frame;
- if ((*i)->frame() > frame) {
- break;
- }
+ while (current_frame < end) {
- if ((tempo = dynamic_cast<const TempoSection*>(*i)) != 0) {
- m.set_tempo (*tempo);
- } else if ((meter = dynamic_cast<const MeterSection*>(*i)) != 0) {
- m.set_meter (*meter);
+ current.beats++;
+ current_frame_exact += beat_frames;
+ current_frame = llrint(current_frame_exact);
+
+ if (current.beats > meter->divisions_per_bar()) {
+ current.bars++;
+ current.beats = 1;
}
- m.set_frame ((*i)->frame ());
- m.set_start ((*i)->start ());
- }
-
- // cerr << "for framepos " << frame << " returning " << m.meter() << " @ " << m.tempo() << " location " << m.frame() << " = " << m.start() << endl;
- return m;
-}
+ if (next_metric != metrics.end()) {
-TempoMetric
-TempoMap::metric_at (BBT_Time bbt) const
-{
- TempoMetric m (first_meter(), first_tempo());
- const Meter* meter;
- const Tempo* tempo;
+ /* no operator >= so invert operator < */
- /* 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
- TempoMap construction.
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("now at %1 next metric @ %2\n", current, (*next_metric)->start()));
- now see if we can find better candidates.
- */
+ if (!(current < (*next_metric)->start())) {
- for (Metrics::const_iterator i = metrics->begin(); i != metrics->end(); ++i) {
+ set_metrics:
+ if (((ts = dynamic_cast<TempoSection*> (*next_metric)) != 0)) {
- BBT_Time section_start ((*i)->start());
+ tempo = ts;
- if (section_start.bars > bbt.bars || (section_start.bars == bbt.bars && section_start.beats > bbt.beats)) {
- break;
- }
+ /* new tempo section: if its on a beat,
+ * we don't have to do anything other
+ * than recompute various distances,
+ * done further below as we transition
+ * the next metric section.
+ *
+ * if its not on the beat, we have to
+ * compute the duration of the beat it
+ * is within, which will be different
+ * from the preceding following ones
+ * since it takes part of its duration
+ * from the preceding tempo and part
+ * from this new tempo.
+ */
- if ((tempo = dynamic_cast<const TempoSection*>(*i)) != 0) {
- m.set_tempo (*tempo);
- } else if ((meter = dynamic_cast<const MeterSection*>(*i)) != 0) {
- m.set_meter (*meter);
- }
+ if (tempo->start().ticks != 0) {
- m.set_frame ((*i)->frame ());
- m.set_start (section_start);
- }
+ double next_beat_frames = tempo->frames_per_beat (_frame_rate);
- return m;
-}
+ 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()));
-void
-TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt) const
-{
- {
- Glib::RWLock::ReaderLock lm (lock);
- bbt_time_unlocked (frame, bbt);
- }
-}
+ /* back up to previous beat */
+ current_frame_exact -= beat_frames;
+ current_frame = llrint(current_frame_exact);
-void
-TempoMap::bbt_time_unlocked (framepos_t frame, BBT_Time& bbt) const
-{
- bbt_time_with_metric (frame, bbt, metric_at (frame));
-}
+ /* 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.
+ */
-void
-TempoMap::bbt_time_with_metric (framepos_t frame, BBT_Time& bbt, const TempoMetric& metric) const
-{
- 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;
+ double offset_within_old_beat = (tempo->frame() - current_frame) / beat_frames;
- /* now compute how far beyond the metric we actually are, and add the
- * relevant number of ticks to the metric's BBT time
- */
+ current_frame_exact += (offset_within_old_beat * beat_frames) + ((1.0 - offset_within_old_beat) * next_beat_frames);
+ current_frame = llrint(current_frame_exact);
- 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
- */
+ /* 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));
- bbt.beats = (uint32_t) fmod (bbt.beats, divisions_per_bar);
+ } else {
- if (bbt.beats == 0) {
- bbt.beats = divisions_per_bar;
- }
-}
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into beat-aligned tempo metric at %1 = %2\n",
+ tempo->start(), current_frame));
+ tempo->set_frame (current_frame);
+ }
-framecnt_t
-TempoMap::count_frames_between (const BBT_Time& start, const BBT_Time& end) const
-{
- TempoMetric bm = metric_at (start);
- TempoMetric em = metric_at (end);
+ } else if ((ms = dynamic_cast<MeterSection*>(*next_metric)) != 0) {
- return count_frames_with_metrics (bm, em, start, end);
-}
+ meter = ms;
-framecnt_t
-TempoMap::count_frames_with_metrics (const TempoMetric& bm, const TempoMetric& em, const BBT_Time& start, const BBT_Time& end) const
-{
- framecnt_t frames = 0;
- framepos_t start_frame = 0;
- framepos_t end_frame = 0;
+ /* new meter section: always defines the
+ * start of a bar.
+ */
- uint32_t bar_offset = start.bars - bm.start().bars;
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into meter section at %1 vs %2 (%3)\n",
+ meter->start(), current, current_frame));
- 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;
+ assert (current.beats == 1);
- start_frame = bm.frame() + (framepos_t) rint(beat_offset * bm.meter().frames_per_division(bm.tempo(),_frame_rate));
+ meter->set_frame (current_frame);
+ }
-#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
+ beat_frames = meter->frames_per_grid (*tempo, _frame_rate);
- bar_offset = end.bars - em.start().bars;
+ DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n",
+ beat_frames, meter->divisions_per_bar(), *((Meter*)meter), *((Tempo*)tempo)));
- beat_offset = bar_offset * em.meter().divisions_per_bar() - (em.start().beats -1) + (end.beats - 1)
- + end.ticks/BBT_Time::ticks_per_bar_division;
+ ++next_metric;
- end_frame = em.frame() + (framepos_t) rint(beat_offset * em.meter().frames_per_division(em.tempo(),_frame_rate));
+ 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 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
+ }
+ }
- frames = end_frame - start_frame;
+ 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, 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, current_frame, current.bars, current.beats));
+ }
- return frames;
+ 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;
+ }
+ }
+ }
}
-framecnt_t
-TempoMap::count_frames_between_metrics (const Meter& meter, const Tempo& tempo, const BBT_Time& start, const BBT_Time& end) const
+TempoMetric
+TempoMap::metric_at (framepos_t frame, Metrics::const_iterator* last) const
{
- /* this is used in timestamping the metrics by actually counting the
- * beats between two metrics ONLY. this means that we know we have a
- * fixed divisions_per_bar and frames_per_division for the entire
- * computation.
- */
-
- framecnt_t frames = 0;
- uint32_t bar = start.bars;
- double beat = (double) start.beats;
- double divisions_counted = 0;
- double divisions_per_bar = 0;
- double division_frames = 0;
- double max_divs;
- int32_t ticks = 0;
-
- divisions_per_bar = meter.divisions_per_bar();
- max_divs = ceil (divisions_per_bar);
- division_frames = meter.frames_per_division (tempo, _frame_rate);
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ TempoMetric m (first_meter(), first_tempo());
- if (start.ticks > 0) {
- ticks = -start.ticks;
-
- }
+ /* 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
+ TempoMap construction.
- frames = 0;
+ now see if we can find better candidates.
+ */
- while (bar < end.bars || (bar == end.bars && beat < end.beats)) {
+ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
- ++beat;
- ++divisions_counted;
-
- if (beat > max_divs) {
+ if ((*i)->frame() > frame) {
+ break;
+ }
- if (beat > divisions_per_bar) {
-
- /* this is a fractional beat at the end of a fractional bar
- so it should only count for the fraction
- */
-
- divisions_counted -= (max_divs - divisions_per_bar);
- }
+ m.set_metric(*i);
- ++bar;
- beat = 1;
+ if (last) {
+ *last = i;
}
}
- ticks += end.ticks;
+ return m;
+}
-#if 0
- cerr << "for " << start.ticks << " and " << end.ticks << " adjust divs by " << ticks << " = "
- << (ticks/BBT_Time::ticks_per_bar_division) << " divs => "
- << ((ticks/BBT_Time::ticks_per_bar_division) * division_frames)
- << " (fpd = " << division_frames << ')'
- << endl;
-#endif
+TempoMetric
+TempoMap::metric_at (BBT_Time bbt) const
+{
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ TempoMetric m (first_meter(), first_tempo());
- frames = (framecnt_t) llrint (floor ((divisions_counted + (ticks/BBT_Time::ticks_per_bar_division)) * division_frames));
+ /* 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
+ TempoMap construction.
-#if 0
- cerr << "Counted " << divisions_counted << " + " << ticks << " from " << start << " to " << end
- << " dpb were " << divisions_per_bar
- << " fpd was " << division_frames
- << " => "
- << frames
- << endl;
-#endif
+ now see if we can find better candidates.
+ */
- return frames;
+ for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) {
-}
+ BBT_Time section_start ((*i)->start());
-framepos_t
-TempoMap::frame_time (const BBT_Time& bbt) const
-{
- BBT_Time start ; /* 1|1|0 */
+ if (section_start.bars > bbt.bars || (section_start.bars == bbt.bars && section_start.beats > bbt.beats)) {
+ break;
+ }
- return count_frames_between (start, bbt);
+ m.set_metric (*i);
+ }
+
+ return m;
}
-framecnt_t
-TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) const
+void
+TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt)
{
- framecnt_t frames = 0;
+ require_map_to (frame);
- BBT_Time when;
- bbt_time(pos, when);
+ Glib::Threads::RWLock::ReaderLock lm (lock);
- {
- Glib::RWLock::ReaderLock lm (lock);
- frames = bbt_duration_at_unlocked (when, bbt,dir);
+ 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 frames;
+ return bbt_time (frame, bbt, bbt_before_or_at (frame));
}
-framecnt_t
-TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int dir) const
+void
+TempoMap::bbt_time_rt (framepos_t frame, BBT_Time& bbt)
{
- framecnt_t frames = 0;
+ Glib::Threads::RWLock::ReaderLock lm (lock, Glib::Threads::TRY_LOCK);
- double divisions_per_bar;
- BBT_Time result;
+ if (!lm.locked()) {
+ throw std::logic_error ("TempoMap::bbt_time_rt() could not lock tempo map");
+ }
- result.bars = max(1U, when.bars + dir * bbt.bars) ;
- result.beats = 1;
- result.ticks = 0;
+ if (_map.empty() || _map.back().frame < frame) {
+ throw std::logic_error (string_compose ("map not long enough to reach %1", frame));
+ }
- TempoMetric metric = metric_at(result);
- divisions_per_bar = metric.meter().divisions_per_bar();
+ return bbt_time (frame, bbt, bbt_before_or_at (frame));
+}
- /* 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
- */
+void
+TempoMap::bbt_time (framepos_t frame, BBT_Time& bbt, const BBTPointList::const_iterator& i)
+{
+ /* CALLER MUST HOLD READ LOCK */
- if (dir >= 0) {
- result.beats = when.beats + bbt.beats;
- result.ticks = when.ticks + bbt.ticks;
+ bbt.bars = (*i).bar;
+ bbt.beats = (*i).beat;
- 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();
+ 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;
+ }
- /* 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
- */
+ if (bbt.beats < 1) {
+ throw std::logic_error ("beats are counted from one");
+ }
- /* of course gtk_ardour only allows bar with at least 1.0 beats .....
- */
+ require_map_to (bbt);
- 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);
- }
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ 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 {
- 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;
+ return ((*e).frame - (*s).frame);
+ }
+}
- /* count ticks */
+framecnt_t
+TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir)
+{
+ BBT_Time when;
+ bbt_time (pos, when);
- if (bbt.ticks <= when.ticks) {
- result.ticks = when.ticks - bbt.ticks;
- } else {
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ return bbt_duration_at_unlocked (when, bbt, dir);
+}
- uint32_t ticks_at_beat= (uint32_t) BBT_Time::ticks_per_bar_division;
- uint32_t t = bbt.ticks - when.ticks;
+framecnt_t
+TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int /*dir*/)
+{
+ if (bbt.bars == 0 && bbt.beats == 0 && bbt.ticks == 0) {
+ return 0;
+ }
- do {
+ /* 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);
- 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;
- }
+ assert (wi != _map.end());
- if (t <= ticks_at_beat) {
- result.ticks = ticks_at_beat - t;
- } else {
- t-= ticks_at_beat;
- }
- } while (t > ticks_at_beat);
+ uint32_t bars = 0;
+ uint32_t beats = 0;
+ while (wi != _map.end() && bars < bbt.bars) {
+ ++wi;
+ if ((*wi).is_bar()) {
+ ++bars;
}
+ }
+ assert (wi != _map.end());
-
+ while (wi != _map.end() && beats < bbt.beats) {
+ ++wi;
+ ++beats;
}
+ assert (wi != _map.end());
+
+ /* add any additional frames related to ticks in the added value */
- if (dir < 0) {
- frames = count_frames_between(result, when);
+ if (bbt.ticks != 0) {
+ return ((*wi).frame - (*start).frame) +
+ (*wi).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat);
} else {
- frames = count_frames_between(when,result);
+ return ((*wi).frame - (*start).frame);
}
-
- return frames;
}
-
-
framepos_t
-TempoMap::round_to_bar (framepos_t fr, int dir)
+TempoMap::round_to_bar (framepos_t fr, RoundMode dir)
{
- {
- Glib::RWLock::ReaderLock lm (lock);
- return round_to_type (fr, dir, Bar);
- }
+ return round_to_type (fr, dir, Bar);
}
-
framepos_t
-TempoMap::round_to_beat (framepos_t fr, int dir)
+TempoMap::round_to_beat (framepos_t fr, RoundMode dir)
{
- {
- Glib::RWLock::ReaderLock lm (lock);
- return round_to_type (fr, dir, Beat);
- }
+ return round_to_type (fr, dir, Beat);
}
framepos_t
-TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, int dir)
+TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir)
{
+ require_map_to (fr);
+
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ BBTPointList::const_iterator i = bbt_before_or_at (fr);
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);
+ 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));
- 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 (or same iff dir == RoundUpMaybe) */
uint32_t mod = the_beat.ticks % ticks_one_subdivisions_worth;
- if (mod == 0) {
+ 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 */
- 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;
+ }
+
+ 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;
}
- the_beat = bbt_add (the_beat, BBT_Time (0, 0, difference));
} else if (dir < 0) {
- /* round to previous */
+ /* round to previous (or same iff dir == RoundDownMaybe) */
- uint32_t mod = the_beat.ticks % ticks_one_subdivisions_worth;
+ uint32_t difference = the_beat.ticks % ticks_one_subdivisions_worth;
- if (mod == 0) {
- /* right on the subdivision, so the difference is just the subdivision ticks */
+ 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;
- } else {
- /* not on subdivision, compute distance to previous subdivision, which
- is just the modulus.
- */
-
- 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)
+TempoMap::round_to_type (framepos_t frame, RoundMode 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);
+
+ 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());
- bbt_time_with_metric (frame, bbt, metric);
+ 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) {
+ if (dir == RoundDownMaybe) {
+ return 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) {
+ if (dir == RoundUpMaybe) {
+ return 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 */
+ /* true rounding: find nearest bar */
- float midbar_beats;
- float midbar_ticks;
+ BBTPointList::const_iterator prev = fi;
+ BBTPointList::const_iterator next = fi;
- 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);
+ if ((*fi).frame == frame) {
+ return frame;
+ }
- BBT_Time midbar (bbt.bars, lrintf (midbar_beats), lrintf (midbar_ticks));
+ while ((*prev).beat != 1) {
+ if (prev == _map.begin()) {
+ break;
+ }
+ prev--;
+ }
- if (bbt < midbar) {
- /* round down */
- bbt.beats = 1;
- bbt.ticks = 0;
+ while ((next != _map.end()) && (*next).beat != 1) {
+ next++;
+ }
+
+ 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 || ((*fi).frame == frame && dir == RoundDownAlways)) {
+ 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 || ((*fi).frame == frame && dir == RoundUpAlways)) {
+ 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 */
+ BBTPointList::const_iterator prev = fi;
+ BBTPointList::const_iterator next = fi;
- /* round to nearest beat */
- if (bbt.ticks >= (BBT_Time::ticks_per_bar_division/2)) {
+ /* 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;
- try {
- bbt = bbt_add (bbt, one_beat, metric);
- }
- catch (...) {
- return frame;
- }
+ 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);
+ abort(); /* NOTREACHED */
+ return 0;
}
-TempoMap::BBTPointList *
-TempoMap::get_points (framepos_t lower, framepos_t upper) const
+void
+TempoMap::get_grid (TempoMap::BBTPointList::const_iterator& begin,
+ TempoMap::BBTPointList::const_iterator& end,
+ framepos_t lower, framepos_t upper)
{
- Metrics::const_iterator next_metric;
- BBTPointList *points;
- double current;
- const MeterSection* meter;
- const MeterSection* m;
- const TempoSection* tempo;
- const TempoSection* t;
- uint32_t bar;
- uint32_t beat;
- double divisions_per_bar;
- double beat_frame;
- double beat_frames;
- double frames_per_bar;
- double delta_bars;
- double delta_beats;
- double dummy;
- framepos_t limit;
-
- meter = &first_meter ();
- tempo = &first_tempo ();
-
- /* find the starting point */
-
- for (next_metric = metrics->begin(); next_metric != metrics->end(); ++next_metric) {
-
- if ((*next_metric)->frame() > lower) {
- break;
- }
-
- if ((t = dynamic_cast<const TempoSection*>(*next_metric)) != 0) {
- tempo = t;
- } else if ((m = dynamic_cast<const MeterSection*>(*next_metric)) != 0) {
- meter = m;
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ if (_map.empty() || (_map.back().frame < upper)) {
+ recompute_map (false, upper);
}
}
- /* We now have:
-
- meter -> the Meter for "lower"
- tempo -> the Tempo for "lower"
- i -> for first new metric after "lower", possibly metrics->end()
-
- Now start generating points.
- */
-
- 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);
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Start with beat frames = %1 bar = %2\n", beat_frames, frames_per_bar));
-
- if (meter->frame() > tempo->frame()) {
- bar = meter->start().bars;
- beat = meter->start().beats;
- current = meter->frame();
- } else {
- bar = tempo->start().bars;
- beat = tempo->start().beats;
- current = tempo->frame();
- }
-
- /* initialize current to point to the bar/beat just prior to the
- lower frame bound passed in. assumes that current is initialized
- above to be on a beat.
- */
-
- delta_bars = (lower-current) / frames_per_bar;
- delta_beats = modf(delta_bars, &dummy) * divisions_per_bar;
- current += (floor(delta_bars) * frames_per_bar) + (floor(delta_beats) * beat_frames);
-
- // adjust bars and beats too
- bar += (uint32_t) (floor(delta_bars));
- beat += (uint32_t) (floor(delta_beats));
-
- points = new BBTPointList;
-
- do {
-
- /* we're going to add bar or beat points until we hit the
- earlier of:
-
- (1) the end point of this request
- (2) the next metric section
- */
-
- if (next_metric == metrics->end()) {
- limit = upper;
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("== limit set to end of request @ %1\n", limit));
- } else {
- limit = (*next_metric)->frame();
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("== limit set to next metric section @ %1\n", limit));
- }
-
- limit = min (limit, upper);
-
- bool reset_current_to_metric_section = true;
- bool bar_adjusted = false;
- TempoSection* ts;
-
- while (current < limit) {
-
- /* if we're at the start of a bar, add bar point */
-
- if (beat == 1) {
- if (current >= lower) {
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", bar, current));
- points->push_back (BBTPoint (*meter, *tempo,(framepos_t) llrint(current), Bar, bar, 1));
-
- }
- }
-
- /* add some beats if we can */
-
- beat_frame = current;
-
- const uint32_t max_divs = ceil (divisions_per_bar);
-
- while (beat <= max_divs && beat_frame < limit) {
-
- if (beat_frame >= lower) {
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Beat at %1|%2 @ %3\n", bar, beat, beat_frame));
- points->push_back (BBTPoint (*meter, *tempo, (framepos_t) llrint(beat_frame), Beat, bar, beat));
- }
-
- beat_frame += beat_frames;
- current = beat_frame;
- beat++;
- }
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("break in beats addition @ end ? %1 out of bpb ? %2 beat frame @ %3 vs %4 beat @ %5 vs %6\n",
- (next_metric == metrics->end()), (beat > max_divs), beat_frame, limit, beat, max_divs));
-
- if (beat <= max_divs) {
-
- /* we didn't reach the end of the bar.
-
- this could be be because we hit "upper"
- or a new metric section.
-
- */
-
- if (next_metric != metrics->end() && limit == (*next_metric)->frame()) {
-
- /* we bumped into a new metric
- * section. meter sections are always
- * at bar boundaries, but tempo
- * sections can begin anywhere and need
- * special handling if they are not on
- * a beat boundary.
- */
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("stopped at metric at %1 @ 2\n", (*next_metric)->start(), (*next_metric)->frame()));
-
- if (((ts = dynamic_cast<TempoSection*> (*next_metric)) != 0) && ts->start().ticks != 0) {
-
- /* compute current at the *next* beat,
- using the tempo section we just
- bumped into.
- */
-
- /* recompute how many frames per
- * division using the tempo we've just
- * found
- */
-
- double next_beat_frames = meter->frames_per_division (*ts,_frame_rate);
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("bumped into non-beat-aligned tempo metric at %1 = %2, adjust next beat using %3\n",
- (*next_metric)->start(), (*next_metric)->frame(), ts->bar_offset()));
-
- current -= beat_frames;
- current += (ts->bar_offset() * beat_frames) + ((1.0 - ts->bar_offset()) * next_beat_frames);
-
- /* avoid resetting current to position
- of the next metric section as we
- iterate through "metrics"
- further on below.
- */
-
- reset_current_to_metric_section = false;
-
- } else if (dynamic_cast<MeterSection*> (*next_metric)) {
-
- /* we hit a new meter
- * section. nothing to do - the
- * right thing will happen as
- * we move to the next metric
- * section down below.
- */
-
- } else {
-
- /* we hit a tempo mark that is
- * precisely on beat. nothing
- * to do here - the
- * right thing will happen as
- * we move to the next metric
- * section down below.
- */
- }
+ begin = lower_bound (_map.begin(), _map.end(), lower);
+ end = upper_bound (_map.begin(), _map.end(), upper);
+}
- } else {
+const TempoSection&
+TempoMap::tempo_section_at (framepos_t frame) const
+{
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ Metrics::const_iterator i;
+ TempoSection* prev = 0;
- /* we hit either:
-
- - the end of the requested range
-
- we'll exit from the outer loop soon.
- */
- }
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
+ TempoSection* t;
- } else if ((beat > max_divs) || (next_metric != metrics->end() && dynamic_cast<MeterSection*>(*next_metric))) {
-
- /* we've arrived at either the end of a bar or
- a new **meter** marker (not tempo marker).
-
- its important to move `current' forward by
- the actual frames_per_bar, not move it to an
- integral beat_frame, so that metrics with
- non-integral beats-per-bar have their bar
- positions set correctly. consider a metric
- with 9-1/2 beats-per-bar. the bar we just
- filled had 10 beat marks, but the bar end is
- 1/2 beat before the last beat mark. And it
- is also possible that a tempo change occured
- in the middle of a bar, so we subtract the
- possible extra fraction from the current
- */
-
- if (beat > max_divs) {
- /* next bar goes where the numbers suggest */
- current -= beat_frames * (max_divs - divisions_per_bar);
- DEBUG_TRACE (DEBUG::TempoMath, "++ next bar from numbers\n");
- } else {
- /* next bar goes where the next meter metric is */
- current = limit;
- DEBUG_TRACE (DEBUG::TempoMath, "++ next bar at next metric\n");
- }
+ if ((t = dynamic_cast<TempoSection*> (*i)) != 0) {
- bar++;
- beat = 1;
- bar_adjusted = true;
+ if ((*i)->frame() > frame) {
+ break;
}
- }
- /* if we're done, then we're done */
-
- if (current >= upper) {
- break;
+ prev = t;
}
+ }
- /* i is an iterator that refers to the next metric (or none).
- if there is a next metric, move to it, and continue.
- */
-
- if (next_metric != metrics->end()) {
-
- if ((t = dynamic_cast<const TempoSection*>(*next_metric)) != 0) {
- tempo = t;
- } else if ((m = dynamic_cast<const MeterSection*>(*next_metric)) != 0) {
- meter = m;
-
- if (!bar_adjusted) {
- /* new MeterSection, beat always returns to 1 */
- beat = 1;
- }
- }
-
- if (reset_current_to_metric_section) {
- current = (*next_metric)->frame ();
- }
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("loop around with current @ %1\n", current));
-
- 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);
-
- DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 bar = %2 dpb %3 meter %4 tempo %5\n",
- beat_frames, frames_per_bar, divisions_per_bar, *((Meter*)meter), *((Tempo*)tempo)));
-
- ++next_metric;
- }
+ if (prev == 0) {
+ fatal << endmsg;
+ abort(); /*NOTREACHED*/
+ }
- } while (1);
+ return *prev;
+}
- return points;
+const Tempo&
+TempoMap::tempo_at (framepos_t frame) const
+{
+ TempoMetric m (metric_at (frame));
+ return m.tempo();
}
-const TempoSection&
-TempoMap::tempo_section_at (framepos_t frame) const
+const MeterSection&
+TempoMap::meter_section_at (framepos_t frame) const
{
- Glib::RWLock::ReaderLock lm (lock);
+ Glib::Threads::RWLock::ReaderLock lm (lock);
Metrics::const_iterator i;
- TempoSection* prev = 0;
+ MeterSection* prev = 0;
- for (i = metrics->begin(); i != metrics->end(); ++i) {
- TempoSection* t;
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
+ MeterSection* t;
- if ((t = dynamic_cast<TempoSection*> (*i)) != 0) {
+ if ((t = dynamic_cast<MeterSection*> (*i)) != 0) {
if ((*i)->frame() > frame) {
break;
if (prev == 0) {
fatal << endmsg;
+ abort(); /*NOTREACHED*/
}
return *prev;
}
-const Tempo&
-TempoMap::tempo_at (framepos_t frame) const
-{
- TempoMetric m (metric_at (frame));
- return m.tempo();
-}
-
-
const Meter&
TempoMap::meter_at (framepos_t frame) const
{
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());
}
}
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();
-
+
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
XMLNode* child = *niter;
try {
TempoSection* ts = new TempoSection (*child);
- metrics->push_back (ts);
+ metrics.push_back (ts);
if (ts->bar_offset() < 0.0) {
if (last_meter) {
ts->update_bar_offset_from_bbt (*last_meter);
- }
+ }
}
}
catch (failed_constructor& err){
error << _("Tempo map: could not set new state, restoring old one.") << endmsg;
- *metrics = old_metrics;
+ metrics = old_metrics;
break;
}
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);
- timestamp_metrics (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<MeterSection*>(*prev) && dynamic_cast<MeterSection*>(*i)) {
+ if ((*prev)->start() == (*i)->start()) {
+ cerr << string_compose (_("Multiple meter definitions found at %1"), (*prev)->start()) << endmsg;
+ error << string_compose (_("Multiple meter definitions found at %1"), (*prev)->start()) << endmsg;
+ return -1;
+ }
+ } else if (dynamic_cast<TempoSection*>(*prev) && dynamic_cast<TempoSection*>(*i)) {
+ if ((*prev)->start() == (*i)->start()) {
+ cerr << string_compose (_("Multiple tempo definitions found at %1"), (*prev)->start()) << endmsg;
+ error << string_compose (_("Multiple tempo definitions found at %1"), (*prev)->start()) << endmsg;
+ return -1;
+ }
+ }
+ }
+ prev = i;
}
+
+ recompute_map (true, -1);
}
PropertyChanged (PropertyChange ());
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<const TempoSection*>(*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? "
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<const TempoSection*>(*i) != 0) {
cnt++;
}
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<const MeterSection*>(*i) != 0) {
cnt++;
}
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);
+ {
+ 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);
+ }
}
- }
-
- 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);
-}
+ /* 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.
+ */
-/**
- * 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;
+ Metrics::iterator i;
+ const MeterSection* meter;
+ const TempoSection* tempo;
+ MeterSection *m;
+ TempoSection *t;
- 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;
- }
+ meter = &first_meter ();
+ tempo = &first_tempo ();
- /* now comes the complicated part. we have to add one beat a time,
- checking for a new metric on every beat.
- */
+ BBT_Time start;
+ BBT_Time end;
- /* grab all meter sections */
+ // cerr << "\n###################### TIMESTAMP via AUDIO ##############\n" << endl;
- list<const MeterSection*> meter_sections;
+ bool first = true;
+ MetricSection* prev = 0;
- for (Metrics::const_iterator x = metrics->begin(); x != metrics->end(); ++x) {
- const MeterSection* ms;
- if ((ms = dynamic_cast<const MeterSection*>(*x)) != 0) {
- meter_sections.push_back (ms);
- }
- }
+ for (i = metrics.begin(); i != metrics.end(); ++i) {
- assert (!meter_sections.empty());
+ BBT_Time bbt;
+ TempoMetric metric (*meter, *tempo);
- list<const MeterSection*>::const_iterator next_meter;
- const Meter* meter = 0;
+ 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
+ }
- /* 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.
- */
+ BBTPointList::const_iterator bi = bbt_before_or_at ((*i)->frame());
+ bbt_time ((*i)->frame(), bbt, bi);
- for (next_meter = meter_sections.begin(); next_meter != meter_sections.end(); ++next_meter) {
+ // cerr << "timestamp @ " << (*i)->frame() << " with " << bbt.bars << "|" << bbt.beats << "|" << bbt.ticks << " => ";
- if (result < (*next_meter)->start()) {
- /* this metric is past the result time. stop looking, we have what we need */
- break;
- }
+ if (first) {
+ first = false;
+ } else {
- 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;
- }
+ if (bbt.ticks > BBT_Time::ticks_per_beat/2) {
+ /* round up to next beat */
+ bbt.beats += 1;
+ }
- meter = *next_meter;
- }
+ bbt.ticks = 0;
- assert (meter != 0);
+ if (bbt.beats != 1) {
+ /* round up to next bar */
+ bbt.bars += 1;
+ bbt.beats = 1;
+ }
+ }
- /* 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)
- */
+ // cerr << bbt << endl;
- while (op.beats) {
+ (*i)->set_start (bbt);
- /* given the current meter, have we gone past the end of the bar ? */
+ if ((t = dynamic_cast<TempoSection*>(*i)) != 0) {
+ tempo = t;
+ // cerr << "NEW TEMPO, frame = " << (*i)->frame() << " start = " << (*i)->start() <<endl;
+ } else if ((m = dynamic_cast<MeterSection*>(*i)) != 0) {
+ meter = m;
+ // cerr << "NEW METER, frame = " << (*i)->frame() << " start = " << (*i)->start() <<endl;
+ } else {
+ fatal << _("programming error: unhandled MetricSection type") << endmsg;
+ abort(); /*NOTREACHED*/
+ }
- if (result.beats >= meter->divisions_per_bar()) {
- /* move to next bar, first beat */
- result.bars++;
- result.beats = 1;
- } else {
- result.beats++;
+ prev = (*i);
}
- /* 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;
- }
+ recompute_map (true);
}
- /* finally, add bars */
-
- result.bars += op.bars++;
- return result;
+ PropertyChanged (PropertyChange ());
}
-
-/**
- * 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
+bool
+TempoMap::remove_time (framepos_t where, framecnt_t amount)
{
- 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.
- */
+ bool moved = false;
- /* grab all meter sections */
+ std::list<MetricSection*> metric_kill_list;
- list<const MeterSection*> meter_sections;
-
- for (Metrics::const_iterator x = metrics->begin(); x != metrics->end(); ++x) {
- const MeterSection* ms;
- if ((ms = dynamic_cast<const MeterSection*>(*x)) != 0) {
- meter_sections.push_back (ms);
- }
+ TempoSection* last_tempo = NULL;
+ MeterSection* last_meter = NULL;
+ bool tempo_after = false; // is there a tempo marker at the first sample after the removed range?
+ bool meter_after = false; // is there a meter marker likewise?
+ {
+ Glib::Threads::RWLock::WriterLock lm (lock);
+ for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) {
+ if ((*i)->frame() >= where && (*i)->frame() < where+amount) {
+ metric_kill_list.push_back(*i);
+ TempoSection *lt = dynamic_cast<TempoSection*> (*i);
+ if (lt)
+ last_tempo = lt;
+ MeterSection *lm = dynamic_cast<MeterSection*> (*i);
+ if (lm)
+ last_meter = lm;
+ }
+ else if ((*i)->frame() >= where) {
+ // TODO: make sure that moved tempo/meter markers are rounded to beat/bar boundaries
+ (*i)->set_frame ((*i)->frame() - amount);
+ if ((*i)->frame() == where) {
+ // marker was immediately after end of range
+ tempo_after = dynamic_cast<TempoSection*> (*i);
+ meter_after = dynamic_cast<MeterSection*> (*i);
+ }
+ moved = true;
+ }
}
- 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<const MeterSection*>::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;
+ //find the last TEMPO and METER metric (if any) and move it to the cut point so future stuff is correct
+ if (last_tempo && !tempo_after) {
+ metric_kill_list.remove(last_tempo);
+ last_tempo->set_frame(where);
+ moved = true;
}
- }
-
- 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");
- }
-
- result.bars--;
- result.beats = meter->divisions_per_bar();
- } else {
-
- /* back one beat */
-
- result.beats--;
+ if (last_meter && !meter_after) {
+ metric_kill_list.remove(last_meter);
+ last_meter->set_frame(where);
+ moved = true;
}
- /* 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.
- */
-
- if (result < meter->start() && next_meter != meter_sections.rend()) {
- meter = *next_meter;
- ++next_meter;
+ //remove all the remaining metrics
+ for (std::list<MetricSection*>::iterator i = metric_kill_list.begin(); i != metric_kill_list.end(); ++i) {
+ metrics.remove(*i);
+ moved = true;
}
- }
-
- /* finally, subtract bars */
- if (op.bars >= result.bars) {
- /* i'm sorry dave, i can't do that */
- throw std::out_of_range ("illegal BBT subtraction");
+ if (moved) {
+ recompute_map (true);
+ }
}
-
- result.bars -= op.bars;
- return result;
+ PropertyChanged (PropertyChange ());
+ return moved;
}
/** Add some (fractional) beats to a session frame position, and return the result in frames.
* pos can be -ve, if required.
*/
framepos_t
-TempoMap::framepos_plus_beats (framepos_t pos, Evoral::MusicalTime beats) const
+TempoMap::framepos_plus_beats (framepos_t pos, Evoral::Beats 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<const TempoSection*>(*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.
+ */
+
+ framepos_t f = (*next_tempo)->frame ();
+
+ if (pos < 0 && f == 0) {
+ f = pos;
+ }
+
+ if (f > pos) {
+ break;
+ }
- if ((t = dynamic_cast<const TempoSection*>(*i)) != 0) {
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()
*/
+ assert(tempo);
+
+ 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) {
+ 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);
+ Evoral::Beats distance_beats = Evoral::Beats::ticks_at_rate(
+ distance_frames, tempo->frames_per_beat (_frame_rate));
/* Amount to subtract this time */
- double const sub = min (distance_beats, beats);
+ Evoral::Beats 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.to_ticks(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<const TempoSection*>(*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<const TempoSection*>(*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<const TempoSection*>(*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
+TempoMap::framepos_minus_beats (framepos_t pos, Evoral::Beats 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<const TempoSection*>(*i)) != 0) {
- tempo = t;
- }
- }
+ if ((t = dynamic_cast<const TempoSection*>(*prev_tempo)) != 0) {
- bool no_more_tempos = false;
+ /* 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.
+ */
- /* Move i back to the tempo before "pos" */
- if (i != metrics->begin ()) {
- while (i != metrics->begin ()) {
- --i;
- t = dynamic_cast<TempoSection*> (*i);
- if (t) {
- break;
+ framepos_t f = (*prev_tempo)->frame ();
+
+ 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;
}
+ assert(tempo);
+ 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) {
+ while (!!beats) {
- /* Distance to the end of this section in frames */
- framecnt_t distance_frames = no_more_tempos ? max_framepos : (pos - (*i)->frame());
+ /* Distance to the start of this section in frames */
+ framecnt_t distance_frames = (pos - tempo->frame());
- /* Distance to the end in beats */
- Evoral::MusicalTime distance_beats = distance_frames / tempo->frames_per_beat (_frame_rate);
+ /* Distance to the start in beats */
+ Evoral::Beats distance_beats = Evoral::Beats::ticks_at_rate(
+ distance_frames, tempo->frames_per_beat (_frame_rate));
/* Amount to subtract this time */
- double const sub = min (distance_beats, beats);
+ Evoral::Beats 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);
+ pos -= sub.to_double() * 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<const TempoSection*>(*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<const TempoSection*>(*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<const TempoSection*>(*prev_tempo) != 0) {
break;
}
}
} else {
- no_more_tempos = true;
+ pos -= llrint (beats.to_double() * tempo->frames_per_beat (_frame_rate));
+ beats = Evoral::Beats();
}
}
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 ();
/* 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;
}
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,
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
* traversed before we change the
* frames_per_beat value.
*/
-
+
pos += llrint (frames_per_beat * (bars * meter->divisions_per_bar()));
bars = 0;
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
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));
}
}
/** Count the number of beats that are equivalent to distance when going forward,
starting at pos.
*/
-Evoral::MusicalTime
+Evoral::Beats
TempoMap::framewalk_to_beats (framepos_t pos, framecnt_t distance) const
{
- Metrics::const_iterator i;
- const TempoSection* tempo;
-
- /* Find the starting tempo */
+ Glib::Threads::RWLock::ReaderLock lm (lock);
+ Metrics::const_iterator next_tempo;
+ const TempoSection* tempo = 0;
+ 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<const TempoSection*>(*i)) != 0) {
+ if ((t = dynamic_cast<const TempoSection*>(*next_tempo)) != 0) {
+
+ if ((*next_tempo)->frame() > effective_pos) {
+ break;
+ }
+
tempo = t;
}
}
/* 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;
+ Evoral::Beats beats = Evoral::Beats();
while (distance) {
/* End of this section */
- framepos_t const end = i == metrics->end() ? max_framepos : (*i)->frame ();
+ 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;
+ }
- /* Distance to the end in frames */
- framecnt_t const distance_to_end = end - pos;
+ /* Amount to subtract this time in frames */
+ framecnt_t const sub = min (distance, distance_to_end);
- /* 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;
- beats += sub / tempo->frames_per_beat (_frame_rate);
+ assert (tempo);
+ beats += Evoral::Beats::ticks_at_rate(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<const TempoSection*>(*i)) != 0) {
- tempo = t;
+
+ if (next_tempo != metrics.end()) {
+
+ tempo = dynamic_cast<const TempoSection*>(*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<const TempoSection*>(*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&
+std::ostream&
operator<< (std::ostream& o, const Meter& m) {
return o << m.divisions_per_bar() << '/' << m.note_divisor();
}
-std::ostream&
+std::ostream&
operator<< (std::ostream& o, const Tempo& t) {
return o << t.beats_per_minute() << " 1/" << t.note_type() << "'s per minute";
}
-std::ostream&
+std::ostream&
operator<< (std::ostream& o, const MetricSection& section) {
o << "MetricSection @ " << section.frame() << " aka " << section.start() << ' ';
const MeterSection* ms;
if ((ts = dynamic_cast<const TempoSection*> (§ion)) != 0) {
- o << *((Tempo*) ts);
+ o << *((const Tempo*) ts);
} else if ((ms = dynamic_cast<const MeterSection*> (§ion)) != 0) {
- o << *((Meter*) ms);
+ o << *((const Meter*) ms);
}
return o;
projects / ardour.git / blobdiff