Fixes according to github discussion

Author: antisvin

LibSource/ComplexFloatArray.cpp

@@ -313,19 +313,15 @@ void ComplexFloatArray::destroy(ComplexFloatArray array){
   delete[] array.data;
 }
 
-void ComplexFloatArray::copyFrom(AudioBuffer& buffer) {
-  FloatArray left = buffer.getSamples(0);
-  FloatArray right = buffer.getSamples(1);
+void ComplexFloatArray::copyFrom(FloatArray real, FloatArray imag) {
   for (size_t i = 0; i < getSize(); i++) {
-    data[i] = ComplexFloat(left[i], right[i]);
+    data[i] = ComplexFloat(real[i], imag[i]);
   }
 }
 
-void ComplexFloatArray::copyTo(AudioBuffer& buffer) {
-  FloatArray left = buffer.getSamples(0);
-  FloatArray right = buffer.getSamples(1);
+void ComplexFloatArray::copyTo(FloatArray real, FloatArray imag) {
   for (size_t i = 0; i < getSize(); i++) {
-    left[i] = data[i].re;
-    right[i] = data[i].im;
+    real[i] = data[i].re;
+    imag[i] = data[i].im;
   }
 }

LibSource/ComplexFloatArray.h

@@ -2,7 +2,6 @@
 #define __ComplexFloatArray_h__
 
 #include "FloatArray.h"
-#include "AudioBuffer.h"
 #include "basicmaths.h"
 
 /**
@@ -133,7 +132,6 @@ struct ComplexFloat {
 
   ComplexFloat& operator+=(float other) {
     re += other;
-    im += other;
     return *this;
   }
 
@@ -157,7 +155,6 @@ struct ComplexFloat {
 
   ComplexFloat& operator-=(float other) {
     re -= other;
-    im -= other;
     return *this;
   }
 
@@ -501,8 +498,23 @@ class ComplexFloatArray : public SimpleArray<ComplexFloat> {
   */
   void setMagnitude(FloatArray magnitude, int offset, size_t count, ComplexFloatArray destination);
 
-  void copyFrom(AudioBuffer& buffer);
-  void copyTo(AudioBuffer& buffer);
+  using SimpleArray<ComplexFloat>::copyFrom;
+  using SimpleArray<ComplexFloat>::copyTo;
+  /**
+   * Merge two channels of audio containing real and imaginary axis data into this array
+   * 
+   * @param[in] real Real axis data
+   * @param[in] imag Imaginary axis data
+  */
+  void copyFrom(FloatArray real, FloatArray imag);
+
+  /**
+   * Split complex data into two channels of audio containing real and imaginary axis data
+   * 
+   * @param[in] real Real axis data
+   * @param[in] imag Imaginary axis data
+  */
+  void copyTo(FloatArray real, FloatArray imag);
 };
 
 #endif // __ComplexFloatArray_h__

TestPatches/QuadratureSineOscillatorTestPatch.hpp

@@ -43,7 +43,9 @@ class QuadratureSineOscillatorTestPatch : public TestPatch {
       osc2->setFrequency(480);      
       AudioBuffer* s1 = AudioBuffer::create(2, 1000);
       AudioBuffer* s2 = AudioBuffer::create(2, 1000);
-      osc1->generate(*s1);
+      ComplexFloatArray cmp = ComplexFloatArray::create(1000);
+      osc1->generate(cmp);
+      cmp.copyTo(s1->getSamples(0), s2->getSamples(1));
       for(size_t i=0; i<1000; ++i) {
         ComplexFloat sample = osc2->generate();
         s2->getSamples(0)[i] = sample.re;
@@ -53,15 +55,15 @@ class QuadratureSineOscillatorTestPatch : public TestPatch {
         CHECK_CLOSE(s1->getSamples(0)[i], s2->getSamples(0)[i], 0.00002);
         CHECK_CLOSE(s1->getSamples(1)[i], s2->getSamples(1)[i], 0.00002);
       }
-      osc1->generate(*s1);
+      osc1->generate(cmp);
       for(size_t i=0; i<1000; ++i) {
         ComplexFloat sample = osc2->generate();
         s2->getSamples(0)[i] = sample.re;
         s2->getSamples(1)[i] = sample.im;
       }
       for(size_t i=0; i<1000; ++i) {
-        CHECK_CLOSE(s1->getSamples(0)[i], s2->getSamples(0)[i], 0.00002);
-        CHECK_CLOSE(s1->getSamples(1)[i], s2->getSamples(1)[i], 0.00002);
+        CHECK_CLOSE(cmp[i].re, s2->getSamples(0)[i], 0.00002);
+        CHECK_CLOSE(cmp[i].im, s2->getSamples(1)[i], 0.00002);
       }
       AudioBuffer::destroy(s1);      
       AudioBuffer::destroy(s2);