diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-19 23:44:40 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:11 +1000 |
| commit | b415b59f790f049a73464efc7fdf0f2858e1bde8 (patch) | |
| tree | bfe28234131383e4b2a7417410134ca21e59086c /gtk2_ardour/editor_rulers.cc | |
| parent | a47359c38280398acc80494cdc72ce129ae0edc3 (diff) | |
Tempo ramps - respect tempo note type and meter note divisor correctly.
- tempo and meter position is now pulse-based,
although meter still has a beat for convenience.
Diffstat (limited to 'gtk2_ardour/editor_rulers.cc')
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 067c05f593..57ee38069b 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1109,15 +1109,11 @@ Editor::compute_bbt_ruler_scale (std::vector<ARDOUR::TempoMap::BBTPoint>& grid, i--; /* XX ?? */ - /* if ((*i).beat >= (*grid.begin()).beat) { bbt_bars = (*i).bar - (*grid.begin()).bar; } else { bbt_bars = (*i).bar - (*grid.begin()).bar; } - */ - /*XXX totally wrong */ - bbt_bars = (floor (_session->tempo_map().beat_at_frame (upper)) - floor (_session->tempo_map().beat_at_frame (lower))) / 4; beats = distance (grid.begin(), grid.end()) - bbt_bars; |