comparison data/fileio/CoreAudioFileReader.cpp @ 822:54829c1e155e tonioni

Merge from the default branch

 #endif
 
 class CoreAudioFileReader::D
 {
 public:
-    D() : blockSize(1024) { }
+    D() : blockSize(1024), valid(false) { }
 
     ExtAudioFileRef file;
     AudioBufferList buffer;
     OSStatus err;
     AudioStreamBasicDescription asbd;
     int blockSize;
+    bool valid;
 };
 
 static QString
 codestr(OSStatus err)
 {

     text[0] = (uerr >> 24) & 0xff;
     text[1] = (uerr >> 16) & 0xff;
     text[2] = (uerr >> 8) & 0xff;
     text[3] = (uerr) & 0xff;
     text[4] = '\0';
-    return QString("%1 (%2)").arg(err).arg(QString::fromAscii(text));
+    return QString("%1 (%2)").arg(err).arg(QString::fromLocal8Bit(text));
 }
 
 CoreAudioFileReader::CoreAudioFileReader(FileSource source,
                                          DecodeMode decodeMode,
                                          CacheMode mode,

     m_d->err = ExtAudioFileGetProperty
 	(m_d->file, kExtAudioFileProperty_FileDataFormat, &propsize, &m_d->asbd);
     
     if (m_d->err) {
         m_error = "CoreAudioReadStream: Error in getting basic description: code " + codestr(m_d->err);
+        ExtAudioFileDispose(m_d->file);
         return;
     }
 	
     m_channelCount = m_d->asbd.mChannelsPerFrame;
     m_fileRate = m_d->asbd.mSampleRate;

     m_d->err = ExtAudioFileSetProperty
 	(m_d->file, kExtAudioFileProperty_ClientDataFormat, propsize, &m_d->asbd);
     
     if (m_d->err) {
         m_error = "CoreAudioReadStream: Error in setting client format: code " + codestr(m_d->err);
+        ExtAudioFileDispose(m_d->file);
         return;
     }
 
     m_d->buffer.mNumberBuffers = 1;
     m_d->buffer.mBuffers[0].mNumberChannels = m_channelCount;
     m_d->buffer.mBuffers[0].mDataByteSize = sizeof(float) * m_channelCount * m_d->blockSize;
     m_d->buffer.mBuffers[0].mData = new float[m_channelCount * m_d->blockSize];
+
+    m_d->valid = true;
 
     initialiseDecodeCache();
 
     if (m_reporter) {
         connect(m_reporter, SIGNAL(cancelled()), this, SLOT(cancelled()));

 
     finishDecodeCache();
     endSerialised();
 
     m_completion = 100;
-
-    ExtAudioFileDispose(m_d->file);
 }
 
 
 CoreAudioFileReader::~CoreAudioFileReader()
 {
     std::cerr << "CoreAudioFileReader::~CoreAudioFileReader" << std::endl;
-    delete[] m_d->buffer.mBuffers[0].mData;
+
+    if (m_d->valid) {
+        ExtAudioFileDispose(m_d->file);
+        delete[] m_d->buffer.mBuffers[0].mData;
+    }
+
     delete m_d;
 }
 
 void
 CoreAudioFileReader::cancelled()