Mercurial > hg > svcore

diff data/fileio/CodedAudioFileReader.h @ 1096:4d9816ba0ebe simple-fft-model

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rework audio file reader API to prefer using std containers
author Chris Cannam
date Mon, 15 Jun 2015 12:19:47 +0100
parents 843f67be0ed9
children abc309f507ae
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.h	Sat Jun 13 08:47:05 2015 +0100
+++ b/data/fileio/CodedAudioFileReader.h	Mon Jun 15 12:19:47 2015 +0100
@@ -38,7 +38,7 @@
         CacheInMemory
     };
 
-    virtual SampleBlock getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
+    virtual std::vector<float> getInterleavedFrames(sv_frame_t start, sv_frame_t count) const;
 
     virtual sv_samplerate_t getNativeRate() const { return m_fileRate; }
 
@@ -60,7 +60,7 @@
     // may throw InsufficientDiscSpace:
     void addSamplesToDecodeCache(float **samples, sv_frame_t nframes);
     void addSamplesToDecodeCache(float *samplesInterleaved, sv_frame_t nframes);
-    void addSamplesToDecodeCache(const SampleBlock &interleaved);
+    void addSamplesToDecodeCache(const std::vector<float> &interleaved);
 
     // may throw InsufficientDiscSpace:
     void finishDecodeCache();
@@ -78,7 +78,7 @@
 protected:
     QMutex m_cacheMutex;
     CacheMode m_cacheMode;
-    SampleBlock m_data;
+    std::vector<float> m_data;
     mutable QReadWriteLock m_dataLock;
     bool m_initialised;
     Serialiser *m_serialiser;