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/onset_detector.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/onset_detector.cc')
-rw-r--r-- | libs/ardour/onset_detector.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc index 7658bd86e8..73f94b061b 100644 --- a/libs/ardour/onset_detector.cc +++ b/libs/ardour/onset_detector.cc @@ -69,7 +69,7 @@ OnsetDetector::use_features (Plugin::FeatureSet& features, ostream* out) (*out) << (*f).timestamp.toString() << endl; } - current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (framecnt_t) floor(sample_rate))); + current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (samplecnt_t) floor(sample_rate))); } } @@ -123,7 +123,7 @@ OnsetDetector::cleanup_onsets (AnalysisFeatureList& t, float sr, float gap_msecs AnalysisFeatureList::iterator i = t.begin(); AnalysisFeatureList::iterator f, b; - const framecnt_t gap_frames = (framecnt_t) floor (gap_msecs * (sr / 1000.0)); + const samplecnt_t gap_samples = (samplecnt_t) floor (gap_msecs * (sr / 1000.0)); while (i != t.end()) { @@ -135,7 +135,7 @@ OnsetDetector::cleanup_onsets (AnalysisFeatureList& t, float sr, float gap_msecs // move f until we find a new value that is far enough away - while ((f != t.end()) && (((*f) - (*i)) < gap_frames)) { + while ((f != t.end()) && (((*f) - (*i)) < gap_samples)) { ++f; } |