diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:46:36 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-12-13 02:46:36 +0000 |
| commit | e0cf3b6354e2c92a6adabe85cb6d6d3c547c287c (patch) | |
| tree | 564e24afbcdda3cf67c06b3ac71db3cb5b66023f /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 6aaf4ea17a326eb06d81b06cb83048fbdaaa8a52 (diff) | |
more fun and games with meter and the tempo map: rename Meter::beats_per_bar() to Meter::divisions_per_bar() so that its clear(er) on what it is actually returning; use Meter::divisions_per_bar() in more (all?) places that need it; fix up dragging meter marks by removing the relevant meter section from the map while we drag; operator<< for some tempo-related objects
git-svn-id: svn://localhost/ardour2/branches/3.0@10995 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 1069e457e6..28afc3b015 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -84,7 +84,7 @@ Editor::draw_metric_marks (const Metrics& metrics) for (Metrics::const_iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((ms = dynamic_cast<const MeterSection*>(*i)) != 0) { - snprintf (buf, sizeof(buf), "%g/%g", ms->beats_per_bar(), ms->note_divisor ()); + snprintf (buf, sizeof(buf), "%g/%g", ms->divisions_per_bar(), ms->note_divisor ()); metric_marks.push_back (new MeterMarker (*this, *meter_group, ARDOUR_UI::config()->canvasvar_MeterMarker.get(), buf, *(const_cast<MeterSection*>(ms)))); } else if ((ts = dynamic_cast<const TempoSection*>(*i)) != 0) { @@ -157,7 +157,7 @@ Editor::compute_current_bbt_points (framepos_t leftmost, framepos_t rightmost) } previous_beat.ticks = 0; - if (_session->tempo_map().meter_at(rightmost).beats_per_bar () > next_beat.beats + 1) { + if (_session->tempo_map().meter_at(rightmost).divisions_per_bar () > next_beat.beats + 1) { next_beat.beats += 1; } else { next_beat.bars += 1; |