summaryrefslogtreecommitdiff
path: root/libs/ardour/utils.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/utils.cc
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (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/utils.cc')
-rw-r--r--libs/ardour/utils.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 17c1da0850..6a59d1b79b 100644
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -383,7 +383,7 @@ ARDOUR::CFStringRefToStdString(CFStringRef stringRef)
#endif // __APPLE__
void
-ARDOUR::compute_equal_power_fades (framecnt_t nframes, float* in, float* out)
+ARDOUR::compute_equal_power_fades (samplecnt_t nframes, float* in, float* out)
{
double step;
@@ -391,7 +391,7 @@ ARDOUR::compute_equal_power_fades (framecnt_t nframes, float* in, float* out)
in[0] = 0.0f;
- for (framecnt_t i = 1; i < nframes - 1; ++i) {
+ for (samplecnt_t i = 1; i < nframes - 1; ++i) {
in[i] = in[i-1] + step;
}
@@ -400,7 +400,7 @@ ARDOUR::compute_equal_power_fades (framecnt_t nframes, float* in, float* out)
const float pan_law_attenuation = -3.0f;
const float scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
- for (framecnt_t n = 0; n < nframes; ++n) {
+ for (samplecnt_t n = 0; n < nframes; ++n) {
float inVal = in[n];
float outVal = 1 - inVal;
out[n] = outVal * (scale * outVal + 1.0f - scale);