Tidy up PeakDetection::find_peaks

2 files changed, 18 insertions, 12 deletions

diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index 91bf50e..0252254 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -267,12 +267,7 @@ PeakDetection::PeakDetection()
 
 PeakDetection::~PeakDetection()
 {
-    while(!_frames.empty())
-    {
-        Frame* f = &_frames.back();  
-        _frames.pop_back();
-        delete f;
-    }
+    _frames.clear();
 }
 
 int PeakDetection::sampling_rate()
@@ -387,13 +382,16 @@ Frames* PeakDetection::find_peaks(const samples& audio)
         }
         
         // get the next frame
-        Frame* f = new Frame();
-        f->size(_frame_size);
-        f->audio(&(audio[pos]));
+        Frame f = Frame();
+        f.size(_frame_size);
+        f.audio(&(audio[pos]));
 
         // find peaks
-        f->add_peaks(find_peaks_in_frame(*f));
-        _frames.push_back(*f);
+        Peaks* peaks = find_peaks_in_frame(f);
+        f.add_peaks(peaks);
+        delete peaks;
+
+        _frames.push_back(f);
         pos += _hop_size;
     }
 
diff --git a/tests/testbase.cpp b/tests/testbase.cpp
index 2677ae7..f214a30 100644
--- a/tests/testbase.cpp
+++ b/tests/testbase.cpp
@@ -352,7 +352,15 @@ protected:
 
     void test_find_peaks()
     {
-        
+        const samples audio = samples(1024);
+        pd->frame_size(256);
+        pd->hop_size(256);
+        Frames* frames = pd->find_peaks(audio);
+        CPPUNIT_ASSERT(frames->size() == 4);
+        for(Frames::iterator i = frames->begin(); i != frames->end(); i++)
+        {
+            CPPUNIT_ASSERT(i->num_peaks() == 0);
+        }
     }
 
 public: