From 4f3b40c3ad337a54168844058adfd3d7cb1f0aea Mon Sep 17 00:00:00 2001 From: John Glover Date: Mon, 29 Aug 2011 13:42:32 +0100 Subject: Tidy up PeakDetection::find_peaks --- src/simpl/base.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src') 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; } -- cgit v1.2.3