[base] Add C++/Cython PeakDetection.frames and Frame.peaks

2 files changed, 16 insertions, 4 deletions

diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index e07f6fe..afffcbb 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -24,7 +24,7 @@ Peak::~Peak()
 }
 
 // Returns true iff this peak is unmatched in the given direction, and has positive amplitude
-bool Peak::is_free(const string direction) 
+bool Peak::is_free(const string direction)
 {
     if(amplitude <= 0.0)
     {
@@ -336,6 +336,16 @@ void PeakDetection::min_peak_separation(number new_min_peak_separation)
     _min_peak_separation = new_min_peak_separation;
 }
 
+int PeakDetection::num_frames()
+{
+    return _frames.size();
+}
+
+Frame* PeakDetection::frame(int frame_number)
+{
+    return _frames[frame_number];
+}
+
 Frames* PeakDetection::frames()
 {
     return &_frames;
@@ -363,7 +373,7 @@ Frames* PeakDetection::find_peaks(number* audio)
     //     {
     //         _frame_size = next_frame_size();
     //     }
-        
+
     //     // get the next frame
     //     Frame f = Frame(_frame_size);
     //     f.audio(audio, pos);
diff --git a/src/simpl/base.h b/src/simpl/base.h
index f70c952..9f12482 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -46,7 +46,7 @@ typedef std::vector<Peak*> Peaks;
 // ---------------------------------------------------------------------------
 class Partial {};
 
-typedef std::vector<Partial> Partials;
+typedef std::vector<Partial*> Partials;
 
 // ---------------------------------------------------------------------------
 // Frame
@@ -109,7 +109,7 @@ public:
     number* synth_residual();
 };
 
-typedef std::vector<Frame> Frames;
+typedef std::vector<Frame*> Frames;
 
 // ---------------------------------------------------------------------------
 // PeakDetection
@@ -151,6 +151,8 @@ public:
     void window_size(int new_window_size);
     number min_peak_separation();
     void min_peak_separation(number new_min_peak_separation);
+    int num_frames();
+    Frame* frame(int frame_number);
     Frames* frames();
 
     // Find and return all spectral peaks in a given frame of audio