Mercurial > hg > svcore

diff data/fileio/WavFileReader.cpp @ 1038:cc27f35aa75c cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Introducing the signed 64-bit frame index type, and fixing build failures from inclusion of -Wconversion with -Werror. Not finished yet.
author Chris Cannam
date Tue, 03 Mar 2015 15:18:24 +0000
parents 59e7fe1b1003
children a1cd5abcb38b
line wrap: on
line diff
--- a/data/fileio/WavFileReader.cpp	Tue Mar 03 09:33:59 2015 +0000
+++ b/data/fileio/WavFileReader.cpp	Tue Mar 03 15:18:24 2015 +0000
@@ -89,7 +89,7 @@
 {
     QMutexLocker locker(&m_mutex);
 
-    int prevCount = m_fileInfo.frames;
+    sv_frame_t prevCount = m_fileInfo.frames;
 
     if (m_file) {
         sf_close(m_file);
@@ -123,7 +123,7 @@
 }
 
 void
-WavFileReader::getInterleavedFrames(int start, int count,
+WavFileReader::getInterleavedFrames(sv_frame_t start, sv_frame_t count,
 				    SampleBlock &results) const
 {
     if (count == 0) return;
@@ -173,7 +173,7 @@
 	m_lastCount = readCount;
     }
 
-    for (int i = 0; i < count * m_fileInfo.channels; ++i) {
+    for (sv_frame_t i = 0; i < count * m_fileInfo.channels; ++i) {
         if (i >= m_bufsiz) {
             cerr << "INTERNAL ERROR: WavFileReader::getInterleavedFrames: " << i << " >= " << m_bufsiz << endl;
         }