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/panners | |
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/panners')
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.cc | 6 | ||||
-rw-r--r-- | libs/panners/1in2out/panner_1in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.cc | 6 | ||||
-rw-r--r-- | libs/panners/2in2out/panner_2in2out.h | 2 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.cc | 4 | ||||
-rw-r--r-- | libs/panners/stereobalance/panner_balance.h | 2 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.cc | 2 | ||||
-rw-r--r-- | libs/panners/vbap/vbap.h | 2 |
8 files changed, 13 insertions, 13 deletions
diff --git a/libs/panners/1in2out/panner_1in2out.cc b/libs/panners/1in2out/panner_1in2out.cc index 753c3a2dae..b279914f94 100644 --- a/libs/panners/1in2out/panner_1in2out.cc +++ b/libs/panners/1in2out/panner_1in2out.cc @@ -155,7 +155,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc /* we've moving the pan by an appreciable amount, so we must - interpolate over 64 frames or nframes, whichever is smaller */ + interpolate over 64 samples or nframes, whichever is smaller */ pframes_t const limit = min ((pframes_t) 64, nframes); pframes_t n; @@ -210,7 +210,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc /* we're moving the pan by an appreciable amount, so we must - interpolate over 64 frames or nframes, whichever is smaller */ + interpolate over 64 samples or nframes, whichever is smaller */ pframes_t const limit = min ((pframes_t) 64, nframes); pframes_t n; @@ -261,7 +261,7 @@ Panner1in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai void Panner1in2out::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) { assert (obufs.count().n_audio() == 2); diff --git a/libs/panners/1in2out/panner_1in2out.h b/libs/panners/1in2out/panner_1in2out.h index 67543fd898..0818bdc918 100644 --- a/libs/panners/1in2out/panner_1in2out.h +++ b/libs/panners/1in2out/panner_1in2out.h @@ -72,7 +72,7 @@ class Panner1in2out : public Panner void distribute_one (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which); void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which); void update (); diff --git a/libs/panners/2in2out/panner_2in2out.cc b/libs/panners/2in2out/panner_2in2out.cc index 2b14f6458c..e9d9ced0ca 100644 --- a/libs/panners/2in2out/panner_2in2out.cc +++ b/libs/panners/2in2out/panner_2in2out.cc @@ -280,7 +280,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai if (fabsf ((delta = (left[which] - desired_left[which]))) > 0.002) { // about 1 degree of arc /* we've moving the pan by an appreciable amount, so we must - interpolate over 64 frames or nframes, whichever is smaller */ + interpolate over 64 samples or nframes, whichever is smaller */ pframes_t const limit = min ((pframes_t) 64, nframes); pframes_t n; @@ -336,7 +336,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai if (fabsf ((delta = (right[which] - desired_right[which]))) > 0.002) { // about 1 degree of arc /* we're moving the pan by an appreciable amount, so we must - interpolate over 64 frames or nframes, whichever is smaller */ + interpolate over 64 samples or nframes, whichever is smaller */ pframes_t const limit = min ((pframes_t) 64, nframes); pframes_t n; @@ -387,7 +387,7 @@ Panner2in2out::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai void Panner2in2out::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) { assert (obufs.count().n_audio() == 2); diff --git a/libs/panners/2in2out/panner_2in2out.h b/libs/panners/2in2out/panner_2in2out.h index f67ac1081b..bb320cd619 100644 --- a/libs/panners/2in2out/panner_2in2out.h +++ b/libs/panners/2in2out/panner_2in2out.h @@ -85,7 +85,7 @@ class Panner2in2out : public Panner void distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which); void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which); }; diff --git a/libs/panners/stereobalance/panner_balance.cc b/libs/panners/stereobalance/panner_balance.cc index f7379f9d6d..ca668f2d1d 100644 --- a/libs/panners/stereobalance/panner_balance.cc +++ b/libs/panners/stereobalance/panner_balance.cc @@ -165,7 +165,7 @@ Pannerbalance::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai if (fabsf ((delta = (pos[which] - desired_pos[which]))) > 0.002) { // about 1 degree of arc /* we've moving the pan by an appreciable amount, so we must - interpolate over 64 frames or nframes, whichever is smaller */ + interpolate over 64 samples or nframes, whichever is smaller */ pframes_t const limit = min ((pframes_t) 64, nframes); pframes_t n; @@ -213,7 +213,7 @@ Pannerbalance::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gai void Pannerbalance::distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which) { assert (obufs.count().n_audio() == 2); diff --git a/libs/panners/stereobalance/panner_balance.h b/libs/panners/stereobalance/panner_balance.h index dabb1da8a5..944a5fb48f 100644 --- a/libs/panners/stereobalance/panner_balance.h +++ b/libs/panners/stereobalance/panner_balance.h @@ -74,7 +74,7 @@ class Pannerbalance : public Panner private: void distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which); void distribute_one_automated (AudioBuffer& srcbuf, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which); }; diff --git a/libs/panners/vbap/vbap.cc b/libs/panners/vbap/vbap.cc index aba9641cb5..ec8d91591e 100644 --- a/libs/panners/vbap/vbap.cc +++ b/libs/panners/vbap/vbap.cc @@ -356,7 +356,7 @@ VBAPanner::distribute_one (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co void VBAPanner::distribute_one_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/, - framepos_t /*start*/, framepos_t /*end*/, + samplepos_t /*start*/, samplepos_t /*end*/, pframes_t /*nframes*/, pan_t** /*buffers*/, uint32_t /*which*/) { /* XXX to be implemented */ diff --git a/libs/panners/vbap/vbap.h b/libs/panners/vbap/vbap.h index 993bbda9d2..96a872bc21 100644 --- a/libs/panners/vbap/vbap.h +++ b/libs/panners/vbap/vbap.h @@ -88,7 +88,7 @@ private: void distribute_one (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, pframes_t nframes, uint32_t which); void distribute_one_automated (AudioBuffer& src, BufferSet& obufs, - framepos_t start, framepos_t end, pframes_t nframes, + samplepos_t start, samplepos_t end, pframes_t nframes, pan_t** buffers, uint32_t which); }; |