comparison data/fileio/DecodingWavFileReader.cpp @ 1096:4d9816ba0ebe simple-fft-model

Rework audio file reader API to prefer using std containers

 #include "WavFileReader.h"
 #include "base/Profiler.h"
 #include "base/ProgressReporter.h"
 
 #include <QFileInfo>
+
+using namespace std;
 
 DecodingWavFileReader::DecodingWavFileReader(FileSource source,
                                              ResampleMode resampleMode,
                                              CacheMode mode,
                                              sv_samplerate_t targetRate,

         }
 
         sv_frame_t blockSize = 16384;
         sv_frame_t total = m_original->getFrameCount();
 
-        SampleBlock block;
+        vector<float> block;
 
         for (sv_frame_t i = 0; i < total; i += blockSize) {
 
             sv_frame_t count = blockSize;
             if (i + count > total) count = total - i;

     }
 
     sv_frame_t blockSize = 16384;
     sv_frame_t total = m_reader->m_original->getFrameCount();
     
-    SampleBlock block;
+    vector<float> block;
     
     for (sv_frame_t i = 0; i < total; i += blockSize) {
         
         sv_frame_t count = blockSize;
         if (i + count > total) count = total - i;

     delete m_reader->m_original;
     m_reader->m_original = 0;
 } 
 
 void
-DecodingWavFileReader::addBlock(const SampleBlock &frames)
+DecodingWavFileReader::addBlock(const vector<float> &frames)
 {
     addSamplesToDecodeCache(frames);
 
     m_processed += frames.size();
 

         m_reporter->setProgress(progress);
     }
 }
 
 void
-DecodingWavFileReader::getSupportedExtensions(std::set<QString> &extensions)
+DecodingWavFileReader::getSupportedExtensions(set<QString> &extensions)
 {
     WavFileReader::getSupportedExtensions(extensions);
 }
 
 bool