comparison runner/MultiplexedReader.cpp @ 290:6122159556bd

Update subrepos to SV 3.0beta1 level
author Chris Cannam
date Fri, 13 Jan 2017 10:53:47 +0000
parents 68dc2d99a5b1
children
comparison
equal deleted inserted replaced
289:d9f6b5fcde6a 290:6122159556bd
52 foreach (AudioFileReader *r, m_readers) { 52 foreach (AudioFileReader *r, m_readers) {
53 delete r; 53 delete r;
54 } 54 }
55 } 55 }
56 56
57 std::vector<float> 57 floatvec_t
58 MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const 58 MultiplexedReader::getInterleavedFrames(sv_frame_t start, sv_frame_t frameCount) const
59 { 59 {
60 int out_chans = m_readers.size(); 60 int out_chans = m_readers.size();
61 61
62 // Allocate and zero 62 // Allocate and zero
63 std::vector<float> block(frameCount * out_chans, 0.f); 63 floatvec_t block(frameCount * out_chans, 0.f);
64 64
65 for (int out_chan = 0; out_chan < out_chans; ++out_chan) { 65 for (int out_chan = 0; out_chan < out_chans; ++out_chan) {
66 66
67 AudioFileReader *reader = m_readers[out_chan]; 67 AudioFileReader *reader = m_readers[out_chan];
68 auto readerBlock = reader->getInterleavedFrames(start, frameCount); 68 auto readerBlock = reader->getInterleavedFrames(start, frameCount);