From d60bbc935a1c7137c766792bf569ea7d6800fba9 Mon Sep 17 00:00:00 2001
From: John Glover <j@johnglover.net>
Date: Fri, 7 Jun 2013 13:00:55 +0200
Subject: Fix memory leaks in peak detection processes

---
 tests/test_partial_tracking.cpp | 60 +++++------------------------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

(limited to 'tests/test_partial_tracking.cpp')

diff --git a/tests/test_partial_tracking.cpp b/tests/test_partial_tracking.cpp
index b4872cd..2363c9d 100644
--- a/tests/test_partial_tracking.cpp
+++ b/tests/test_partial_tracking.cpp
@@ -41,27 +41,15 @@ void TestMQPartialTracking::test_basic() {
 void TestMQPartialTracking::test_peaks() {
     int num_frames = 8;
     Frames frames;
-    Peaks peaks;
 
     _pd.clear();
     _pt.reset();
 
     for(int i = 0; i < num_frames; i++) {
-        Peak* p = new Peak();
-        p->amplitude = 0.4;
-        p->frequency = 220;
-
-        Peak* p2 = new Peak();
-        p2->amplitude = 0.2;
-        p2->frequency = 440;
-
         Frame* f = new Frame();
-        f->add_peak(p);
-        f->add_peak(p2);
-
+        f->add_peak(0.4, 220, 0, 0);
+        f->add_peak(0.2, 440, 0, 0);
         frames.push_back(f);
-        peaks.push_back(p);
-        peaks.push_back(p2);
     }
 
     _pt.find_partials(frames);
@@ -78,10 +66,6 @@ void TestMQPartialTracking::test_peaks() {
                                      PRECISION);
     }
 
-    for(int i = 0; i < num_frames * 2; i++) {
-        delete peaks[i];
-    }
-
     for(int i = 0; i < num_frames; i++) {
         delete frames[i];
     }
@@ -131,27 +115,15 @@ void TestSMSPartialTracking::test_basic() {
 void TestSMSPartialTracking::test_peaks() {
     int num_frames = 8;
     Frames frames;
-    Peaks peaks;
 
     _pd.clear();
     _pt.reset();
 
     for(int i = 0; i < num_frames; i++) {
-        Peak* p = new Peak();
-        p->amplitude = 0.4;
-        p->frequency = 220;
-
-        Peak* p2 = new Peak();
-        p2->amplitude = 0.2;
-        p2->frequency = 440;
-
         Frame* f = new Frame();
-        f->add_peak(p);
-        f->add_peak(p2);
-
+        f->add_peak(0.4, 220, 0, 0);
+        f->add_peak(0.2, 440, 0, 0);
         frames.push_back(f);
-        peaks.push_back(p);
-        peaks.push_back(p2);
     }
 
     _pt.find_partials(frames);
@@ -168,10 +140,6 @@ void TestSMSPartialTracking::test_peaks() {
                                      PRECISION);
     }
 
-    for(int i = 0; i < num_frames * 2; i++) {
-        delete peaks[i];
-    }
-
     for(int i = 0; i < num_frames; i++) {
         delete frames[i];
     }
@@ -217,27 +185,15 @@ void TestLorisPartialTracking::test_basic() {
 void TestLorisPartialTracking::test_peaks() {
     int num_frames = 8;
     Frames frames;
-    Peaks peaks;
 
     _pd.clear();
     _pt.reset();
 
     for(int i = 0; i < num_frames; i++) {
-        Peak* p = new Peak();
-        p->amplitude = 0.4;
-        p->frequency = 220;
-
-        Peak* p2 = new Peak();
-        p2->amplitude = 0.2;
-        p2->frequency = 440;
-
         Frame* f = new Frame();
-        f->add_peak(p);
-        f->add_peak(p2);
-
+        f->add_peak(0.4, 220, 0, 0);
+        f->add_peak(0.2, 440, 0, 0);
         frames.push_back(f);
-        peaks.push_back(p);
-        peaks.push_back(p2);
     }
 
     _pt.find_partials(frames);
@@ -254,10 +210,6 @@ void TestLorisPartialTracking::test_peaks() {
                                      PRECISION);
     }
 
-    for(int i = 0; i < num_frames * 2; i++) {
-        delete peaks[i];
-    }
-
     for(int i = 0; i < num_frames; i++) {
         delete frames[i];
     }
-- 
cgit v1.2.3