Mercurial > hg > svgui

diff layer/SpectrogramLayer.h @ 1060:5eb4d79334b9 spectrogram-minor-refactor

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace old logic with calls to new functions; basic refactor part A done, the code now compiles again
author Chris Cannam
date Wed, 15 Jun 2016 09:46:20 +0100
parents e1c2dcc7790e
children a0f234acd6e7
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Wed Jun 15 08:52:07 2016 +0100
+++ b/layer/SpectrogramLayer.h	Wed Jun 15 09:46:20 2016 +0100
@@ -387,8 +387,6 @@
                                        bool rightToLeft,
                                        double softTimeLimit) const;
 
-    void normalise(std::vector<float> &, Normalization norm) const;
-    
     std::vector<float> getColumnFromFFTModel(FFTModel *model,
                                              int sx,
                                              int minbin,
@@ -399,7 +397,7 @@
                                                  int minbin,
                                                  int bincount) const;
 
-    void scaleColumn(std::vector<float> &col) const;
+    std::vector<float> scaleColumn(const std::vector<float> &in) const;
 
     std::vector<float> distributeColumn(const std::vector<float> &in,
                                         int h,
@@ -412,6 +410,8 @@
                              MagnitudeRange &overallMag,
                              bool &overallMagChanged) const;
 
+    std::vector<float> normalizeColumn(const std::vector<float> &in) const;
+
     std::vector<float> peakPickColumn(const std::vector<float> &in) const;
 
     std::vector<float> applyDisplayGain(const std::vector<float> &in) const;