Mercurial > hg > svcore
diff data/fileio/WavFileReader.cpp @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | f8e3dcbafb4d 70e172e6cc59 |
children | 14747f24ad04 |
line wrap: on
line diff
--- a/data/fileio/WavFileReader.cpp Wed Jan 23 10:31:40 2019 +0000 +++ b/data/fileio/WavFileReader.cpp Wed Jan 23 14:43:43 2019 +0000 @@ -28,7 +28,7 @@ WavFileReader::WavFileReader(FileSource source, bool fileUpdating, Normalisation normalisation) : - m_file(0), + m_file(nullptr), m_source(source), m_path(source.getLocalFilename()), m_seekable(false), @@ -279,7 +279,7 @@ { int count; - if (sf_command(0, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(count))) { + if (sf_command(nullptr, SFC_GET_FORMAT_MAJOR_COUNT, &count, sizeof(count))) { extensions.insert("wav"); extensions.insert("aiff"); extensions.insert("aifc"); @@ -290,7 +290,7 @@ SF_FORMAT_INFO info; for (int i = 0; i < count; ++i) { info.format = i; - if (!sf_command(0, SFC_GET_FORMAT_MAJOR, &info, sizeof(info))) { + if (!sf_command(nullptr, SFC_GET_FORMAT_MAJOR, &info, sizeof(info))) { QString ext = QString(info.extension).toLower(); extensions.insert(ext); if (ext == "oga") {