diff data/fileio/DecodingWavFileReader.cpp @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t

--- a/data/fileio/DecodingWavFileReader.cpp	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/DecodingWavFileReader.cpp	Wed Jun 18 13:51:16 2014 +0100
@@ -22,11 +22,12 @@
 #include <QFileInfo>
 
 DecodingWavFileReader::DecodingWavFileReader(FileSource source,
-						 ResampleMode resampleMode,
-						 CacheMode mode,
-						 size_t targetRate,
-                                                 ProgressReporter *reporter) :
-    CodedAudioFileReader(mode, targetRate),
+                                             ResampleMode resampleMode,
+                                             CacheMode mode,
+                                             int targetRate,
+                                             bool normalised,
+                                             ProgressReporter *reporter) :
+    CodedAudioFileReader(mode, targetRate, normalised),
     m_source(source),
     m_path(source.getLocalFilename()),
     m_cancelled(false),
@@ -63,14 +64,14 @@
                 (tr("Decoding %1...").arg(QFileInfo(m_path).fileName()));
         }
 
-        size_t blockSize = 16384;
-        size_t total = m_original->getFrameCount();
+        int blockSize = 16384;
+        int total = m_original->getFrameCount();
 
         SampleBlock block;
 
-        for (size_t i = 0; i < total; i += blockSize) {
+        for (int i = 0; i < total; i += blockSize) {
 
-            size_t count = blockSize;
+            int count = blockSize;
             if (i + count > total) count = total - i;
 
             m_original->getInterleavedFrames(i, count, block);
@@ -120,14 +121,14 @@
         m_reader->startSerialised("DecodingWavFileReader::Decode");
     }
 
-    size_t blockSize = 16384;
-    size_t total = m_reader->m_original->getFrameCount();
+    int blockSize = 16384;
+    int total = m_reader->m_original->getFrameCount();
     
     SampleBlock block;
     
-    for (size_t i = 0; i < total; i += blockSize) {
+    for (int i = 0; i < total; i += blockSize) {
         
-        size_t count = blockSize;
+        int count = blockSize;
         if (i + count > total) count = total - i;
         
         m_reader->m_original->getInterleavedFrames(i, count, block);