summaryrefslogtreecommitdiff
path: root/libs/ardour/panner.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2007-05-03 23:28:57 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2007-05-03 23:28:57 +0000
commita8da89d745c6a7e7d4c20dfcfb16b2537d767428 (patch)
tree06fb6cc1795ef89a7ed847395c550b6215e253df /libs/ardour/panner.cc
parent5a1ca70f07aeb999ba3f0f09dbd49f1d50505f3c (diff)
optimize some performance bottlenecks; remove jack_nframes_t that crept back into the code
git-svn-id: svn://localhost/ardour2/branches/midi@1779 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
-rw-r--r--libs/ardour/panner.cc18
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc
index d3c0dc8d4e..2690ac868d 100644
--- a/libs/ardour/panner.cc
+++ b/libs/ardour/panner.cc
@@ -244,7 +244,7 @@ BaseStereoPanner::load (istream& in, string path, uint32_t& linecnt)
_automation.clear ();
while (in.getline (line, sizeof (line), '\n')) {
- jack_nframes_t when;
+ nframes_t when;
double value;
++linecnt;
@@ -281,11 +281,11 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain
return;
}
- Sample* const src = srcbuf.data(nframes);
+ Sample* const src = srcbuf.data();
/* LEFT */
- dst = obufs.get_audio(0).data(nframes);
+ dst = obufs.get_audio(0).data();
if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
@@ -335,7 +335,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain
/* RIGHT */
- dst = obufs.get_audio(1).data(nframes);
+ dst = obufs.get_audio(1).data();
if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
@@ -434,7 +434,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
Sample* dst;
pan_t* pbuf;
- Sample* const src = srcbuf.data(nframes);
+ Sample* const src = srcbuf.data();
/* fetch positional data */
@@ -473,7 +473,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
/* LEFT */
- dst = obufs.get_audio(0).data(nframes);
+ dst = obufs.get_audio(0).data();
pbuf = buffers[0];
for (nframes_t n = 0; n < nframes; ++n) {
@@ -484,7 +484,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob
/* RIGHT */
- dst = obufs.get_audio(1).data(nframes);
+ dst = obufs.get_audio(1).data();
pbuf = buffers[1];
for (nframes_t n = 0; n < nframes; ++n) {
@@ -642,12 +642,12 @@ Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_co
return;
}
- Sample* const src = srcbuf.data(nframes);
+ Sample* const src = srcbuf.data();
for (n = 0, o = parent.outputs.begin(); o != parent.outputs.end(); ++o, ++n) {
- dst = obufs.get_audio(n).data(nframes);
+ dst = obufs.get_audio(n).data();
#ifdef CAN_INTERP
if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc