comparison data/fileio/WavFileReader.cpp @ 936:0c1d6de8f44b

Merge from branch warnfix_no_size_t

 void
 WavFileReader::updateFrameCount()
 {
     QMutexLocker locker(&m_mutex);
 
-    size_t prevCount = m_fileInfo.frames;
+    int prevCount = m_fileInfo.frames;
 
     if (m_file) {
         sf_close(m_file);
         m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
         if (!m_file || m_fileInfo.channels <= 0) {

     updateFrameCount();
     m_updating = false;
 }
 
 void
-WavFileReader::getInterleavedFrames(size_t start, size_t count,
+WavFileReader::getInterleavedFrames(int start, int count,
 				    SampleBlock &results) const
 {
     if (count == 0) return;
     results.clear();
     results.reserve(count * m_fileInfo.channels);

 
 	m_lastStart = start;
 	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;
         }
 	results.push_back(m_buffer[i]);
     }