Mercurial > hg > svcore

diff data/fileio/WavFileReader.h @ 1349:330bcc92507d 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Take a different approach to using libsndfile -- the _fd function doesn't work for me in this build, so use the wchar api
author Chris Cannam
date Fri, 06 Jan 2017 20:51:47 +0000
parents b3cb0edc25cd
children 1bc6f70cb4c7
line wrap: on
line diff
--- a/data/fileio/WavFileReader.h	Fri Jan 06 16:40:11 2017 +0000
+++ b/data/fileio/WavFileReader.h	Fri Jan 06 20:51:47 2017 +0000
@@ -18,9 +18,10 @@
 
 #include "AudioFileReader.h"
 
+#define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1
+
 #include <sndfile.h>
 #include <QMutex>
-#include <QFile>
 
 #include <set>
 
@@ -67,12 +68,11 @@
 
 protected:
     SF_INFO m_fileInfo;
-    SNDFILE *m_sndfile;
+    SNDFILE *m_file;
 
     FileSource m_source;
     QString m_path;
     QString m_error;
-    QFile m_qfile;
 
     bool m_seekable;