projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
call IO::prepare_for_reset() on BOTH IO nodes of a PortInsert's XML state, not just...
[ardour.git]
/
libs
/
ardour
/
onset_detector.cc
diff --git
a/libs/ardour/onset_detector.cc
b/libs/ardour/onset_detector.cc
index 7658bd86e8211c9db60f3018b530376cead8692d..73f94b061b9af8f1eaa86f53e7af5418ff7eb550 100644
(file)
--- 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;
}
(*out) << (*f).timestamp.toString() << endl;
}
- current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (
fram
ecnt_t) floor(sample_rate)));
+ current_results->push_back (RealTime::realTime2Frame ((*f).timestamp, (
sampl
ecnt_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;
AnalysisFeatureList::iterator i = t.begin();
AnalysisFeatureList::iterator f, b;
- const
framecnt_t gap_frames = (fram
ecnt_t) floor (gap_msecs * (sr / 1000.0));
+ const
samplecnt_t gap_samples = (sampl
ecnt_t) floor (gap_msecs * (sr / 1000.0));
while (i != t.end()) {
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
// move f until we find a new value that is far enough away
- while ((f != t.end()) && (((*f) - (*i)) < gap_
fram
es)) {
+ while ((f != t.end()) && (((*f) - (*i)) < gap_
sampl
es)) {
++f;
}
++f;
}