diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-20 04:41:45 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 7fc3b0c34c552d7be862897bd0aaa542453e9973 (patch) | |
| tree | 35898328a86aefec5ac18a00c56c8577f4779d1f /libs/ardour/session_click.cc | |
| parent | 94187e66a2ae2bc2ab082ef614c25b35ec0d5e24 (diff) | |
Initial stab at tempo ramps.
Replaces the list of points in TempoMap with TempoSection functions, which
compute tempo-at or tick-at time relative to tempo section start.
TempoMap consults them additively to determine things like bbt_time(),
frame_time() get_grid() etc.
This has a marked effect on scrolling speed along with the code simplification
in the places it has been attempted.
Several things are broken here.
Currently every ramp except the last one is an exponential ramp. this may
be simple to fix :).
Mouse-over midi grid doesn't match mouse click grid. should also be simple.
Many things seem to work, but their accuracy should be in question until
each area has been addressed.
Diffstat (limited to 'libs/ardour/session_click.cc')
| -rw-r--r-- | libs/ardour/session_click.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index 4cb556c8a6..872828e57e 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -42,8 +42,7 @@ Pool Click::pool ("click", sizeof (Click), 1024); void Session::click (framepos_t start, framecnt_t nframes) { - TempoMap::BBTPointList::const_iterator points_begin; - TempoMap::BBTPointList::const_iterator points_end; + vector<TempoMap::BBTPoint> points; Sample *buf; framecnt_t click_distance; @@ -72,13 +71,13 @@ Session::click (framepos_t start, framecnt_t nframes) BufferSet& bufs = get_scratch_buffers(ChanCount(DataType::AUDIO, 1)); buf = bufs.get_audio(0).data(); - _tempo_map->get_grid (points_begin, points_end, start, end); + _tempo_map->get_grid (points, start, end); - if (distance (points_begin, points_end) == 0) { + if (distance (points.begin(), points.end()) == 0) { goto run_clicks; } - for (TempoMap::BBTPointList::const_iterator i = points_begin; i != points_end; ++i) { + for (vector<TempoMap::BBTPoint>::iterator i = points.begin(); i != points.end(); ++i) { switch ((*i).beat) { case 1: if (click_emphasis_data && Config->get_use_click_emphasis () == true) { |