Mercurial > hg > svcore
diff data/fileio/WavFileReader.cpp @ 1343:c380e56c95f5 3.0-integration
Untabify some more
author | Chris Cannam |
---|---|
date | Fri, 06 Jan 2017 09:50:13 +0000 |
parents | 54af1e21705c |
children | b3cb0edc25cd |
line wrap: on
line diff
--- a/data/fileio/WavFileReader.cpp Fri Jan 06 09:43:40 2017 +0000 +++ b/data/fileio/WavFileReader.cpp Fri Jan 06 09:50:13 2017 +0000 @@ -43,18 +43,18 @@ m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo); if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) { - SVDEBUG << "WavFileReader::initialize: Failed to open file at \"" + SVDEBUG << "WavFileReader::initialize: Failed to open file at \"" << m_path << "\" (" << sf_strerror(m_file) << ")" << endl; - if (m_file) { - m_error = QString("Couldn't load audio file '%1':\n%2") - .arg(m_path).arg(sf_strerror(m_file)); - } else { - m_error = QString("Failed to open audio file '%1'") - .arg(m_path); - } - return; + if (m_file) { + m_error = QString("Couldn't load audio file '%1':\n%2") + .arg(m_path).arg(sf_strerror(m_file)); + } else { + m_error = QString("Failed to open audio file '%1'") + .arg(m_path); + } + return; } if (m_fileInfo.channels > 0) { @@ -147,11 +147,11 @@ if (start >= m_fileInfo.frames) { // SVDEBUG << "WavFileReader::getInterleavedFrames: " << start // << " > " << m_fileInfo.frames << endl; - return {}; + return {}; } if (start + count > m_fileInfo.frames) { - count = m_fileInfo.frames - start; + count = m_fileInfo.frames - start; } // Because WaveFileModel::getSummaries() is called separately for