diff data/model/AggregateWaveModel.cpp @ 1326:54af1e21705c 3.0-integration

Update to use bqvec allocator for float vectors

--- a/data/model/AggregateWaveModel.cpp	Tue Dec 13 12:03:48 2016 +0000
+++ b/data/model/AggregateWaveModel.cpp	Tue Dec 13 15:23:21 2016 +0000
@@ -94,7 +94,7 @@
     return m_components.begin()->model->getSampleRate();
 }
 
-vector<float>
+floatvec_t
 AggregateWaveModel::getData(int channel, sv_frame_t start, sv_frame_t count) const
 {
     int ch0 = channel, ch1 = channel;
@@ -103,8 +103,7 @@
         ch1 = getChannelCount()-1;
     }
 
-    vector<float> result(count, 0.f);
-
+    floatvec_t result(count, 0.f);
     sv_frame_t longest = 0;
     
     for (int c = ch0; c <= ch1; ++c) {
@@ -123,13 +122,13 @@
     return result;
 }
 
-vector<vector<float>>
+vector<floatvec_t>
 AggregateWaveModel::getMultiChannelData(int fromchannel, int tochannel,
                                         sv_frame_t start, sv_frame_t count) const
 {
     sv_frame_t min = count;
 
-    vector<vector<float>> result;
+    vector<floatvec_t> result;
 
     for (int c = fromchannel; c <= tochannel; ++c) {
         auto here = getData(c, start, count);