zynaddsubfx

commit 4c33241868a3a866c2c9f0ec5146a42d6fdc1847
parent 5bd39c2e1d41ad2ddea93e3296eb0b838143cce0
Author: fundamental <[email protected]>
Date:   Sun,  2 May 2010 14:08:27 -0400

Merge branch 'nio' into niox

Diffstat:
M
src/Effects/EffectMgr.cpp
 | 
1
-
M
src/Samples/Sample.cpp
 | 
4
----

2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/src/Effects/EffectMgr.cpp b/src/Effects/EffectMgr.cpp
@@ -33,7 +33,6 @@
 
 #include <iostream>
 using namespace std;
->>>>>>> master:src/Effects/EffectMgr.cpp
 
 EffectMgr::EffectMgr(int insertion_, pthread_mutex_t *mutex_)
     :insertion(insertion_),
diff --git a/src/Samples/Sample.cpp b/src/Samples/Sample.cpp
@@ -167,10 +167,6 @@ Sample &Sample::append(const Sample &smp)
 Sample Sample::subSample(int a, int b) const
 {
     return Sample(b-a, buffer+a);
-    delete buffer;
-
-    buffer     = nbuffer;
-    bufferSize = nbufferSize;
 }
 
 REALTYPE Sample::max() const