From 574a20f95fc240c9d76276c3955f1e8b46a14c17 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 21 Feb 2018 17:47:26 -0500
Subject: [PATCH] Rename SpecPowerMeter as SpecPowerCalculation

---
 src/import/FormatClassifier.h |  2 +-
 src/import/SpecPowerMeter.cpp | 18 +++++++++---------
 src/import/SpecPowerMeter.h   |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/import/FormatClassifier.h b/src/import/FormatClassifier.h
index fd5f0c79e..a233bd9fd 100644
--- a/src/import/FormatClassifier.h
+++ b/src/import/FormatClassifier.h
@@ -76,7 +76,7 @@ private:
 
    FormatVectorT        mClasses;
    MultiFormatReader    mReader;
-   SpecPowerMeter       mMeter;
+   SpecPowerCalculation mMeter;
 
 #ifdef FORMATCLASSIFIER_SIGNAL_DEBUG
    std::unique_ptr<DebugWriter> mpWriter;
diff --git a/src/import/SpecPowerMeter.cpp b/src/import/SpecPowerMeter.cpp
index b2cf4bcff..a0b2a2c21 100644
--- a/src/import/SpecPowerMeter.cpp
+++ b/src/import/SpecPowerMeter.cpp
@@ -2,16 +2,16 @@
 
   Audacity: A Digital Audio Editor
 
-  SpecPowerMeter.cpp
+  SpecPowerCalculation.cpp
 
   Philipp Sibler
 
 ******************************************************************//**
 
-\class SpecPowerMeter
-\brief SpecPowerMeter is a simple spectral power level meter.
+\class SpecPowerCalculation
+\brief SpecPowerCalculation is a simple spectral power level meter.
 
-SpecPowerMeter operates in the Fourier domain and allows power level
+SpecPowerCalculation operates in the Fourier domain and allows power level
 measurements in subbands or in the entire signal band.  
 
 *//*******************************************************************/
@@ -24,7 +24,7 @@ measurements in subbands or in the entire signal band.
 
 #include "../FFT.h"
 
-SpecPowerMeter::SpecPowerMeter(size_t sigLen)
+SpecPowerCalculation::SpecPowerCalculation(size_t sigLen)
   : mSigLen(sigLen)
   , mSigI{ sigLen, true }
   , mSigFR{ sigLen }
@@ -32,11 +32,11 @@ SpecPowerMeter::SpecPowerMeter(size_t sigLen)
 {
 }
 
-SpecPowerMeter::~SpecPowerMeter()
+SpecPowerCalculation::~SpecPowerCalculation()
 {
 }
 
-float SpecPowerMeter::CalcPower(float* sig, float fc, float bw)
+float SpecPowerCalculation::CalcPower(float* sig, float fc, float bw)
 {
    float pwr;
    int loBin, hiBin;
@@ -58,7 +58,7 @@ float SpecPowerMeter::CalcPower(float* sig, float fc, float bw)
    return pwr;     
 }
 
-float SpecPowerMeter::CalcBinPower(float* sig_f_r, float* sig_f_i, int loBin, int hiBin)
+float SpecPowerCalculation::CalcBinPower(float* sig_f_r, float* sig_f_i, int loBin, int hiBin)
 {
    float pwr = 0.0f;
    
@@ -70,7 +70,7 @@ float SpecPowerMeter::CalcBinPower(float* sig_f_r, float* sig_f_i, int loBin, in
    return pwr;
 }
 
-int SpecPowerMeter::Freq2Bin(float fc)
+int SpecPowerCalculation::Freq2Bin(float fc)
 {
    int bin;
    
diff --git a/src/import/SpecPowerMeter.h b/src/import/SpecPowerMeter.h
index 2009aedd0..5fba4fe71 100644
--- a/src/import/SpecPowerMeter.h
+++ b/src/import/SpecPowerMeter.h
@@ -14,7 +14,7 @@
 #include <cstddef>
 #include "../SampleFormat.h"
 
-class SpecPowerMeter
+class SpecPowerCalculation
 {
    const size_t mSigLen;
    
@@ -25,8 +25,8 @@ class SpecPowerMeter
    float CalcBinPower(float* sig_f_r, float* sig_f_i, int loBin, int hiBin);
    int Freq2Bin(float fc);
 public:
-   SpecPowerMeter(size_t sigLen);
-   ~SpecPowerMeter();
+   SpecPowerCalculation(size_t sigLen);
+   ~SpecPowerCalculation();
    
    float CalcPower(float* sig, float fc, float bw);
 };