comparison layer/SpectrogramLayer.cpp @ 1061:861f40fc9958 spectrogram-minor-refactor

Don't need these

         fft->getPhasesAt(sx, values.data(), minbin, bincount);
     } else {
         fft->getMagnitudesAt(sx, values.data(), minbin, bincount);
     }
 
-    return move(values);
+    return values;
 }
 
 vector<float>
 SpectrogramLayer::getColumnFromGenericModel(DenseThreeDimensionalModel *model,
                                             int sx, // column number in model

         throw std::logic_error("can't use phase scale with generic 3d model");
     }
 
     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> 
 SpectrogramLayer::scaleColumn(const vector<float> &in) const
 {

     out.reserve(in.size());
     float scale = 2.f / float(m_fftSize);
     for (auto v: in) {
         out.push_back(v * scale);
     }
-    return move(out);
+    return out;
 }
 
 static bool
 is_peak(const vector<float> &values, int ix)
 {

     }
     
     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);
     
     for (int i = 0; in_range_for(in, i); ++i) {
         if (is_peak(in, i)) {
             out[i] = in[i];
         }
     }
 
-    return move(out);
+    return out;
 }
 
 vector<float>
 SpectrogramLayer::applyDisplayGain(const vector<float> &in) const
 {

     vector<float> out;
     out.reserve(in.size());
     for (auto v: in) {
         out.push_back(v * m_gain);
     }
-    return move(out);
+    return out;
 }
 
 // order:
 // get column -> scale -> distribute/interpolate -> record extents -> normalise -> peak pick -> apply display gain