comparison data/fileio/WavFileReader.h @ 1348:b3cb0edc25cd 3.0-integration

Update WAV/MP3/BZipFileDevice code to avoid using local 8-bit encoding

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     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>
 
 /**
  * Reader for audio files using libsndfile.

     void updateFrameCount();
     void updateDone();
 
 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;
 
     mutable QMutex m_mutex;
     mutable floatvec_t m_buffer;