Update of /cvsroot/audacity/audacity-src/src/effects/ladspa
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4118
Modified Files:
LadspaEffect.cpp LadspaEffect.h
Log Message:
Removed unnecessary(?) intermediate buffer copy
Index: LadspaEffect.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ladspa/LadspaEffect.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- LadspaEffect.cpp 30 Jul 2006 06:18:10 -0000 1.33
+++ LadspaEffect.cpp 25 Aug 2006 05:04:58 -0000 1.34
@@ -47,7 +47,6 @@
mData = data;
pluginName = LAT1CTOWX(data->Name);
- buffer = NULL;
fInBuffer = NULL;
fOutBuffer = NULL;
@@ -271,7 +270,6 @@
if (mBlockSize == 0) {
mBlockSize = left->GetMaxBlockSize() * 2;
- buffer = new float[mBlockSize];
fInBuffer = new float *[inputs];
unsigned long i;
for (i = 0; i < inputs; i++)
@@ -315,33 +313,24 @@
longSampleCount rs = rstart;
while (len) {
int block = mBlockSize;
- int i;
if (block > len)
block = len;
if (left && inputs > 0) {
- left->Get((samplePtr)buffer, floatSample, ls, block);
- for (i = 0; i < block; i++)
- fInBuffer[0][i] = buffer[i];
+ left->Get((samplePtr)fInBuffer[0], floatSample, ls, block);
}
if (right && inputs > 1) {
- right->Get((samplePtr)buffer, floatSample, rs, block);
- for (i = 0; i < block; i++)
- fInBuffer[1][i] = buffer[i];
+ right->Get((samplePtr)fInBuffer[1], floatSample, rs, block);
}
mData->run(handle, block);
if (left && outputs > 0) {
- for (i = 0; i < block; i++)
- buffer[i] = fOutBuffer[0][i];
- left->Set((samplePtr)buffer, floatSample, ls, block);
+ left->Set((samplePtr)fOutBuffer[0], floatSample, ls, block);
}
if (right && outputs > 1) {
- for (i = 0; i < block; i++)
- buffer[i] = fOutBuffer[1][i];
- right->Set((samplePtr)buffer, floatSample, rs, block);
+ right->Set((samplePtr)fOutBuffer[1], floatSample, rs, block);
}
len -= block;
@@ -369,23 +358,27 @@
void LadspaEffect::End()
{
- if (buffer) {
- unsigned long i;
+ unsigned long i;
- delete[]buffer;
+ if (fInBuffer) {
for (i = 0; i < inputs; i++) {
- delete fInBuffer[i];
+ if (fInBuffer[i]) {
+ delete [] fInBuffer[i];
+ }
}
+ delete [] fInBuffer;
+ fInBuffer = NULL;
+ }
+
+ if (fOutBuffer) {
for (i = 0; i < outputs; i++) {
- delete fOutBuffer[i];
+ if (fOutBuffer[i]) {
+ delete [] fOutBuffer[i];
+ }
}
-
- delete[] fInBuffer;
- delete[] fOutBuffer;
+ delete [] fOutBuffer;
+ fOutBuffer = NULL;
}
- buffer = NULL;
- fInBuffer = NULL;
- fOutBuffer = NULL;
}
class Slider:public wxSlider
Index: LadspaEffect.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/effects/ladspa/LadspaEffect.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- LadspaEffect.h 30 Jul 2006 06:18:10 -0000 1.14
+++ LadspaEffect.h 25 Aug 2006 05:04:58 -0000 1.15
@@ -57,7 +57,6 @@
const LADSPA_Descriptor *mData;
sampleCount mBlockSize;
- float *buffer;
float **fInBuffer;
float **fOutBuffer;
unsigned long inputs;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
