Mercurial > hg > svcore

diff data/fileio/WavFileReader.cpp @ 929:59e7fe1b1003 warnfix_no_size_t

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents e802e550a1f2
children cc27f35aa75c
line wrap: on
line diff
--- a/data/fileio/WavFileReader.cpp	Tue Jun 17 13:52:07 2014 +0100
+++ b/data/fileio/WavFileReader.cpp	Tue Jun 17 14:33:42 2014 +0100
@@ -89,7 +89,7 @@
 {
     QMutexLocker locker(&m_mutex);
 
-    size_t prevCount = m_fileInfo.frames;
+    int prevCount = m_fileInfo.frames;
 
     if (m_file) {
         sf_close(m_file);
@@ -123,7 +123,7 @@
 }
 
 void
-WavFileReader::getInterleavedFrames(size_t start, size_t count,
+WavFileReader::getInterleavedFrames(int start, int count,
 				    SampleBlock &results) const
 {
     if (count == 0) return;
@@ -173,7 +173,7 @@
 	m_lastCount = readCount;
     }
 
-    for (size_t i = 0; i < count * m_fileInfo.channels; ++i) {
+    for (int i = 0; i < count * m_fileInfo.channels; ++i) {
         if (i >= m_bufsiz) {
             cerr << "INTERNAL ERROR: WavFileReader::getInterleavedFrames: " << i << " >= " << m_bufsiz << endl;
         }