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

Update to use bqvec allocator for float vectors
author Chris Cannam
date Tue, 13 Dec 2016 15:23:21 +0000
parents 1309b66eff53
children 48e9f538e6e9 c0f69bddea12
line wrap: on
line diff
--- a/data/model/test/MockWaveModel.cpp	Tue Dec 13 12:03:48 2016 +0000
+++ b/data/model/test/MockWaveModel.cpp	Tue Dec 13 15:23:21 2016 +0000
@@ -26,14 +26,14 @@
     }
 }
 
-vector<float>
+floatvec_t
 MockWaveModel::getData(int channel, sv_frame_t start, sv_frame_t count) const
 {
     sv_frame_t i = 0;
 
 //    cerr << "MockWaveModel::getData(" << channel << "," << start << "," << count << "): ";
 
-    vector<float> data;
+    floatvec_t data;
     
     while (i < count) {
 	sv_frame_t idx = start + i;
@@ -48,11 +48,11 @@
     return data;
 }
 
-vector<vector<float>>
+vector<floatvec_t>
 MockWaveModel::getMultiChannelData(int fromchannel, int tochannel,
 				   sv_frame_t start, sv_frame_t count) const
 {
-    vector<vector<float>> data(tochannel - fromchannel + 1);
+    vector<floatvec_t> data(tochannel - fromchannel + 1);
     
     for (int c = fromchannel; c <= tochannel; ++c) {
         data.push_back(getData(c, start, count));