Mercurial > hg > svcore
diff data/fileio/AudioFileReader.h @ 1527:710e6250a401 zoom
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Sep 2018 13:51:14 +0100 |
| parents | 54af1e21705c |
| children | ad5f892c0c4d f8e3dcbafb4d |
line wrap: on
line diff
--- a/data/fileio/AudioFileReader.h Mon Dec 12 15:18:52 2016 +0000 +++ b/data/fileio/AudioFileReader.h Mon Sep 17 13:51:14 2018 +0100 @@ -117,8 +117,8 @@ * thread-safe -- that is, safe to call from multiple threads with * different arguments on the same object at the same time. */ - virtual std::vector<float> getInterleavedFrames(sv_frame_t start, - sv_frame_t count) const = 0; + virtual floatvec_t getInterleavedFrames(sv_frame_t start, + sv_frame_t count) const = 0; /** * Return de-interleaved samples for count frames from index @@ -127,8 +127,8 @@ * will contain getChannelCount() sample blocks of count samples * each (or fewer if end of file is reached). */ - virtual std::vector<std::vector<float> > getDeInterleavedFrames(sv_frame_t start, - sv_frame_t count) const; + virtual std::vector<floatvec_t> getDeInterleavedFrames(sv_frame_t start, + sv_frame_t count) const; // only subclasses that do not know exactly how long the audio // file is until it's been completely decoded should implement this