comparison data/fileio/WavFileReader.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents c324d410b096
children ecef2f1bec18
comparison
equal deleted inserted replaced
349:f39d33b0b265 383:94fc0591ea43
109 WavFileReader::getInterleavedFrames(size_t start, size_t count, 109 WavFileReader::getInterleavedFrames(size_t start, size_t count,
110 SampleBlock &results) const 110 SampleBlock &results) const
111 { 111 {
112 if (count == 0) return; 112 if (count == 0) return;
113 results.clear(); 113 results.clear();
114 results.reserve(count * m_fileInfo.channels);
114 115
115 QMutexLocker locker(&m_mutex); 116 QMutexLocker locker(&m_mutex);
116 117
117 if (!m_file || !m_channelCount) { 118 if (!m_file || !m_channelCount) {
118 return; 119 return;