From 47476b90888e1c455a16072c800f8fac6c9f22e7 Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Wed, 25 May 2022 11:16:06 +0100
Subject: [PATCH] Tidy

---
 src/finer/R3StretcherImpl.cpp | 3 ---
 src/finer/R3StretcherImpl.h   | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/finer/R3StretcherImpl.cpp b/src/finer/R3StretcherImpl.cpp
index ee29a45..47a6fa8 100644
--- a/src/finer/R3StretcherImpl.cpp
+++ b/src/finer/R3StretcherImpl.cpp
@@ -399,9 +399,6 @@ R3StretcherImpl::consume()
                 v_copy(scale->prevMag.data(),
                        scale->mag.data(),
                        bufSize);
-                v_copy(scale->prevAdvancedPhase.data(),
-                       scale->advancedPhase.data(),
-                       bufSize);
             }
         
             for (const auto &band : cd->guidance.fftBands) {
diff --git a/src/finer/R3StretcherImpl.h b/src/finer/R3StretcherImpl.h
index 8e388b5..1cc9d67 100644
--- a/src/finer/R3StretcherImpl.h
+++ b/src/finer/R3StretcherImpl.h
@@ -152,16 +152,14 @@ protected:
     struct ChannelScaleData {
         int fftSize;
         int bufSize; // size of every freq-domain array here: fftSize/2 + 1
-        //!!! review later which of these we are actually using!
         FixedVector<double> timeDomain;
         FixedVector<double> real;
         FixedVector<double> imag;
         FixedVector<double> mag;
         FixedVector<double> phase;
         FixedVector<double> advancedPhase;
-        FixedVector<int> troughs; //!!! not used in every scale
-        FixedVector<double> prevMag; //!!! not used in every scale
-        FixedVector<double> prevAdvancedPhase;
+        FixedVector<int> troughs;
+        FixedVector<double> prevMag;
         FixedVector<double> accumulator;
 
         ChannelScaleData(int _fftSize, int _longestFftSize) :
@@ -175,7 +173,6 @@ protected:
             advancedPhase(bufSize, 0.f),
             troughs(bufSize, 0),
             prevMag(bufSize, 0.f),
-            prevAdvancedPhase(bufSize, 0.f),
             accumulator(_longestFftSize, 0.f)
         { }