add Cython version of simpl base frame class

2 files changed, 72 insertions, 80 deletions

diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index 2ec670e..f5a42b0 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -2,8 +2,7 @@
 #include "base.h"
 
 using namespace std;
-
-namespace Simpl {
+using namespace simpl;
 
 // ---------------------------------------------------------------------------
 // Peak
@@ -48,7 +47,9 @@ bool Peak::is_free(const string direction)
     }
     else
     {
-        Throw(InvalidArgument, "Invalid direction");
+        // Throw(InvalidArgument, "Invalid direction");
+        // TODO: fix this
+        printf("ERROR: InvalidArgument\n");
     }
 
     return true;
@@ -80,9 +81,9 @@ void Frame::init()
     _max_peaks = 100;
     _max_partials = 100;
     _audio = NULL;
-    // _synth = NULL;
-    // _residual = NULL;
-    // _synth_residual = NULL;
+    _synth = NULL;
+    _residual = NULL;
+    _synth_residual = NULL;
 }
 
 // Frame - peaks
@@ -190,50 +191,45 @@ void Frame::size(int new_size)
     _size = new_size;
 }
 
-// void Frame::audio(const number* new_audio)
-// {
-//     _audio = new_audio;
-// }
-
-void Frame::audio(const samples& new_audio, const int offset)
+void Frame::audio(number* new_audio)
 {
-    _audio = &new_audio + offset;
+    _audio = new_audio;
 }
 
-const samples* Frame::audio()
+number* Frame::audio()
 {
     return _audio;
 }
 
-// void Frame::synth(const number* new_synth)
-// {
-//     _synth = new_synth;
-// }
+void Frame::synth(number* new_synth)
+{
+    _synth = new_synth;
+}
 
-// const number* Frame::synth()
-// {
-//     return _synth;
-// }
+number* Frame::synth()
+{
+    return _synth;
+}
 
-// void Frame::residual(const number* new_residual)
-// {
-//     _residual = new_residual;
-// }
+void Frame::residual(number* new_residual)
+{
+    _residual = new_residual;
+}
 
-// const number* Frame::residual()
-// {
-//     return _residual;
-// }
+number* Frame::residual()
+{
+    return _residual;
+}
 
-// void Frame::synth_residual(const number* new_synth_residual)
-// {
-//     _synth_residual = new_synth_residual;
-// }
+void Frame::synth_residual(number* new_synth_residual)
+{
+    _synth_residual = new_synth_residual;
+}
 
-// const number* Frame::synth_residual()
-// {
-//     return _synth_residual;
-// }
+number* Frame::synth_residual()
+{
+    return _synth_residual;
+}
 
 // ---------------------------------------------------------------------------
 // PeakDetection
@@ -355,32 +351,31 @@ Peaks* PeakDetection::find_peaks_in_frame(const Frame& frame)
 // Find and return all spectral peaks in a given audio signal.
 // If the signal contains more than 1 frame worth of audio, it will be broken
 // up into separate frames, each containing a std::vector of peaks.
-Frames* PeakDetection::find_peaks(const samples& audio)
-{
-    _frames.clear();
-    unsigned int pos = 0;
-    while(pos < audio.size())
-    {
-        // get the next frame size
-        if(!_static_frame_size)
-        {
-            _frame_size = next_frame_size();
-        }
+// Frames* PeakDetection::find_peaks(const samples& audio)
+Frames* PeakDetection::find_peaks(number* audio)
+{
+    // _frames.clear();
+    // unsigned int pos = 0;
+    // while(pos < audio.size())
+    // {
+    //     // get the next frame size
+    //     if(!_static_frame_size)
+    //     {
+    //         _frame_size = next_frame_size();
+    //     }
         
-        // get the next frame
-        Frame f = Frame(_frame_size);
-        f.audio(audio, pos);
+    //     // get the next frame
+    //     Frame f = Frame(_frame_size);
+    //     f.audio(audio, pos);
 
-        // find peaks
-        Peaks* peaks = find_peaks_in_frame(f);
-        f.add_peaks(peaks);
-        delete peaks;
+    //     // find peaks
+    //     Peaks* peaks = find_peaks_in_frame(f);
+    //     f.add_peaks(peaks);
+    //     delete peaks;
 
-        _frames.push_back(f);
-        pos += _hop_size;
-    }
+    //     _frames.push_back(f);
+    //     pos += _hop_size;
+    // }
 
-    return &_frames;
+    // return &_frames;
 }
-
-} // end of namespace Simpl
diff --git a/src/simpl/base.h b/src/simpl/base.h
index 2657cf1..12df565 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -7,11 +7,10 @@
 
 using namespace std;
 
-namespace Simpl 
+namespace simpl 
 {
 
 typedef double number;
-typedef std::vector<number> samples;
 
 // ---------------------------------------------------------------------------
 // Peak
@@ -68,10 +67,10 @@ private:
     int _max_partials;
     Peaks _peaks;
     Partials _partials;
-    const samples* _audio;
-    // const number* _synth;
-    // const number* _residual;
-    // const number* _synth_residual;
+    number* _audio;
+    number* _synth;
+    number* _residual;
+    number* _synth_residual;
     void init();
 
 public:
@@ -100,16 +99,14 @@ public:
     // audio buffers
     int size();
     void size(int new_size);
-    // void audio(const number* new_audio);
-    void audio(const samples& new_audio, const int offset = 0);
-    const samples* audio();
-
-    // void synth(const number* new_synth);
-    // const number* synth();
-    // void residual(const number* new_residual);
-    // const number* residual();
-    // void synth_residual(const number* new_synth_residual);
-    // const number* synth_residual();
+    void audio(number* new_audio);
+    number* audio();
+    void synth(number* new_synth);
+    number* synth();
+    void residual(number* new_residual);
+    number* residual();
+    void synth_residual(number* new_synth_residual);
+    number* synth_residual();
 };
 
 typedef std::vector<Frame> Frames;
@@ -161,8 +158,8 @@ public:
 
     // Find and return all spectral peaks in a given audio signal.
     // If the signal contains more than 1 frame worth of audio, it will be broken
-    // up into separate frames, with a std::vector of peaks returned for each frame.
-    virtual Frames* find_peaks(const samples& audio);
+    // up into separate frames, with an array of peaks returned for each frame.
+    virtual Frames* find_peaks(number* audio);
 };
 
 } // end of namespace Simpl