changeset 1061:861f40fc9958 spectrogram-minor-refactor

Don't need these
author Chris Cannam
date Wed, 15 Jun 2016 14:43:51 +0100
parents 5eb4d79334b9
children 38ecdd5924ac
files layer/SpectrogramLayer.cpp
diffstat 1 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Wed Jun 15 09:46:20 2016 +0100
+++ b/layer/SpectrogramLayer.cpp	Wed Jun 15 14:43:51 2016 +0100
@@ -2367,7 +2367,7 @@
         fft->getMagnitudesAt(sx, values.data(), minbin, bincount);
     }
 
-    return move(values);
+    return values;
 }
 
 vector<float>
@@ -2382,8 +2382,8 @@
 
     auto col = model->getColumn(sx);
         
-    return move(vector<float>(col.data() + minbin,
-                              col.data() + minbin + bincount));
+    return vector<float>(col.data() + minbin,
+                         col.data() + minbin + bincount);
 }
 
 vector<float> 
@@ -2399,7 +2399,7 @@
     for (auto v: in) {
         out.push_back(v * scale);
     }
-    return move(out);
+    return out;
 }
 
 static bool
@@ -2523,13 +2523,13 @@
     for (auto v: in) {
         out.push_back(v * scale);
     }
-    return move(out);
+    return out;
 }
 
 vector<float>
 SpectrogramLayer::peakPickColumn(const vector<float> &in) const
 {
-    if (m_binDisplay != PeakBins) return in;
+    if (m_binDisplay == AllBins) return in;
 
     vector<float> out(in.size(), 0.f);
     
@@ -2539,7 +2539,7 @@
         }
     }
 
-    return move(out);
+    return out;
 }
 
 vector<float>
@@ -2552,7 +2552,7 @@
     for (auto v: in) {
         out.push_back(v * m_gain);
     }
-    return move(out);
+    return out;
 }
 
 // order: