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

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

 #include <QFileInfo>
 
 using namespace std;
 
 WavFileReader::WavFileReader(FileSource source, bool fileUpdating) :
-    m_file(0),
+    m_sndfile(0),
     m_source(source),
     m_path(source.getLocalFilename()),
+    m_qfile(m_path),
     m_seekable(false),
     m_lastStart(0),
     m_lastCount(0),
     m_updating(fileUpdating)
 {

     m_channelCount = 0;
     m_sampleRate = 0;
 
     m_fileInfo.format = 0;
     m_fileInfo.frames = 0;
-    m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
-
-    if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) {
+
+    if (!m_qfile.open(QIODevice::ReadOnly)) {
         SVDEBUG << "WavFileReader::initialize: Failed to open file at \""
-                << m_path << "\" ("
-                << sf_strerror(m_file) << ")" << endl;
-
-        if (m_file) {
+                << m_path << "\"" << endl;
+        m_error = QString("Failed to open audio file '%1'").arg(m_path);
+        return;
+    }
+    
+    m_sndfile = sf_open_fd(m_qfile.handle(), SFM_READ, &m_fileInfo, false);
+
+    if (!m_sndfile || (!fileUpdating && m_fileInfo.channels <= 0)) {
+        SVDEBUG << "WavFileReader::initialize: Failed to open file at \""
+                << m_path << "\" (" << sf_strerror(m_sndfile) << ")" << endl;
+        if (m_sndfile) {
             m_error = QString("Couldn't load audio file '%1':\n%2")
-                .arg(m_path).arg(sf_strerror(m_file));
+                .arg(m_path).arg(sf_strerror(m_sndfile));
         } else {
-            m_error = QString("Failed to open audio file '%1'")
-                .arg(m_path);
+            m_error = QString("Failed to open audio file '%1'").arg(m_path);
         }
         return;
     }
 
     if (m_fileInfo.channels > 0) {

     SVDEBUG << "WavFileReader: Filename " << m_path << ", frame count " << m_frameCount << ", channel count " << m_channelCount << ", sample rate " << m_sampleRate << ", format " << m_fileInfo.format << ", seekable " << m_fileInfo.seekable << " adjusted to " << m_seekable << endl;
 }
 
 WavFileReader::~WavFileReader()
 {
-    if (m_file) sf_close(m_file);
+    if (m_sndfile) sf_close(m_sndfile);
 }
 
 void
 WavFileReader::updateFrameCount()
 {
     QMutexLocker locker(&m_mutex);
 
     sv_frame_t prevCount = m_fileInfo.frames;
 
-    if (m_file) {
-        sf_close(m_file);
-        m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
-        if (!m_file || m_fileInfo.channels <= 0) {
-            SVDEBUG << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" ("
-                    << sf_strerror(m_file) << ")" << endl;
+    if (m_sndfile) {
+        sf_close(m_sndfile);
+        m_sndfile = sf_open_fd(m_qfile.handle(), SFM_READ, &m_fileInfo, false);
+        if (!m_sndfile || m_fileInfo.channels <= 0) {
+            SVCERR << "WavFileReader::updateFrameCount: Failed to reopen file at \"" << m_path << "\" ("
+                    << sf_strerror(m_sndfile) << ")" << endl;
         }
     }
 
 //    SVDEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl;
 

 
     QMutexLocker locker(&m_mutex);
 
     Profiler profiler("WavFileReader::getInterleavedFrames");
     
-    if (!m_file || !m_channelCount) {
+    if (!m_sndfile || !m_channelCount) {
         return {};
     }
 
     if (start >= m_fileInfo.frames) {
 //        SVDEBUG << "WavFileReader::getInterleavedFrames: " << start

         lastRead.partial();
     } else {
         lastRead.miss();
     }
     
-    if (sf_seek(m_file, start, SEEK_SET) < 0) {
+    if (sf_seek(m_sndfile, start, SEEK_SET) < 0) {
         return {};
     }
 
     floatvec_t data;
     sv_frame_t n = count * m_fileInfo.channels;

 
     m_lastStart = start;
     m_lastCount = count;
     
     sf_count_t readCount = 0;
-    if ((readCount = sf_readf_float(m_file, data.data(), count)) < 0) {
+    if ((readCount = sf_readf_float(m_sndfile, data.data(), count)) < 0) {
         return {};
     }
 
     m_buffer = data;
     return data;