comparison data/fileio/AudioFileReader.cpp @ 1527:710e6250a401 zoom

Merge from default branch

 
 #include "AudioFileReader.h"
 
 using std::vector;
 
-vector<vector<float>>
+vector<floatvec_t>
 AudioFileReader::getDeInterleavedFrames(sv_frame_t start, sv_frame_t count) const
 {
-    vector<float> interleaved = getInterleavedFrames(start, count);
+    floatvec_t interleaved = getInterleavedFrames(start, count);
     
     int channels = getChannelCount();
     if (channels == 1) return { interleaved };
     
     sv_frame_t rc = interleaved.size() / channels;
 
-    vector<vector<float>> frames(channels, vector<float>(rc, 0.f));
+    vector<floatvec_t> frames(channels, floatvec_t(rc, 0.f));
     
     for (int c = 0; c < channels; ++c) {
         for (sv_frame_t i = 0; i < rc; ++i) {
             frames[c][i] = interleaved[i * channels + c];
         }