diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-09-18 12:39:17 -0400 |
commit | 30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch) | |
tree | 620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/session_click.cc | |
parent | cb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff) |
globally change all use of "frame" to refer to audio into "sample".
Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode
and video in order to keep the legible
Diffstat (limited to 'libs/ardour/session_click.cc')
-rw-r--r-- | libs/ardour/session_click.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/session_click.cc b/libs/ardour/session_click.cc index fae442f6c5..b4b5283fd8 100644 --- a/libs/ardour/session_click.cc +++ b/libs/ardour/session_click.cc @@ -40,7 +40,7 @@ using namespace PBD; Pool Click::pool ("click", sizeof (Click), 1024); void -Session::add_click (framepos_t pos, bool emphasis) +Session::add_click (samplepos_t pos, bool emphasis) { if (emphasis) { if (click_emphasis_data && Config->get_use_click_emphasis () == true) { @@ -54,10 +54,10 @@ Session::add_click (framepos_t pos, bool emphasis) } void -Session::click (framepos_t start, framecnt_t nframes) +Session::click (samplepos_t start, samplecnt_t nframes) { vector<TempoMap::BBTPoint> points; - framecnt_t click_distance; + samplecnt_t click_distance; if (_click_io == 0) { return; @@ -86,9 +86,9 @@ Session::click (framepos_t start, framecnt_t nframes) } #endif /* start could be negative at this point */ - const framepos_t end = start + nframes; + const samplepos_t end = start + nframes; /* correct start, potentially */ - start = max (start, (framepos_t) 0); + start = max (start, (samplepos_t) 0); _tempo_map->get_grid (points, start, end); @@ -99,11 +99,11 @@ Session::click (framepos_t start, framecnt_t nframes) for (vector<TempoMap::BBTPoint>::iterator i = points.begin(); i != points.end(); ++i) { switch ((*i).beat) { case 1: - add_click ((*i).frame, true); + add_click ((*i).sample, true); break; default: if (click_emphasis_data == 0 || (Config->get_use_click_emphasis () == false) || (click_emphasis_data && (*i).beat != 1)) { // XXX why is this check needed ?? - add_click ((*i).frame, false); + add_click ((*i).sample, false); } break; } @@ -115,7 +115,7 @@ Session::click (framepos_t start, framecnt_t nframes) } void -Session::run_click (framepos_t start, framepos_t nframes) +Session::run_click (samplepos_t start, samplepos_t nframes) { Glib::Threads::RWLock::ReaderLock clickm (click_lock, Glib::Threads::TRY_LOCK); @@ -131,8 +131,8 @@ Session::run_click (framepos_t start, framepos_t nframes) for (list<Click*>::iterator i = clicks.begin(); i != clicks.end(); ) { - framecnt_t copy; - framecnt_t internal_offset; + samplecnt_t copy; + samplecnt_t internal_offset; Click *clk; clk = *i; @@ -169,7 +169,7 @@ Session::run_click (framepos_t start, framepos_t nframes) } void -Session::setup_click_sounds (Sample** data, Sample const * default_data, framecnt_t* length, framecnt_t default_length, string const & path) +Session::setup_click_sounds (Sample** data, Sample const * default_data, samplecnt_t* length, samplecnt_t default_length, string const & path) { if (*data != default_data) { delete[] *data; @@ -264,5 +264,5 @@ Session::clear_clicks () } clicks.clear (); - _clicks_cleared = _transport_frame; + _clicks_cleared = _transport_sample; } |