Mercurial > hg > svcore
diff data/fileio/WavFileReader.h @ 1348:b3cb0edc25cd 3.0-integration
Update WAV/MP3/BZipFileDevice code to avoid using local 8-bit encoding
author | Chris Cannam |
---|---|
date | Fri, 06 Jan 2017 16:40:11 +0000 |
parents | 54af1e21705c |
children | 330bcc92507d |
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h Fri Jan 06 15:53:02 2017 +0000 +++ b/data/fileio/WavFileReader.h Fri Jan 06 16:40:11 2017 +0000 @@ -13,13 +13,14 @@ COPYING included with this distribution for more information. */ -#ifndef _WAV_FILE_READER_H_ -#define _WAV_FILE_READER_H_ +#ifndef SV_WAV_FILE_READER_H +#define SV_WAV_FILE_READER_H #include "AudioFileReader.h" #include <sndfile.h> #include <QMutex> +#include <QFile> #include <set> @@ -66,11 +67,12 @@ protected: SF_INFO m_fileInfo; - SNDFILE *m_file; + SNDFILE *m_sndfile; FileSource m_source; QString m_path; QString m_error; + QFile m_qfile; bool m_seekable;