Mercurial > hg > svcore

diff data/fileio/CoreAudioFileReader.cpp @ 1160:ea636412f9fe 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Thu, 04 Feb 2016 11:16:05 +0000
parents 9c7633904ec2
children 0a9193dc136b
line wrap: on
line diff
--- a/data/fileio/CoreAudioFileReader.cpp	Thu Feb 04 11:13:39 2016 +0000
+++ b/data/fileio/CoreAudioFileReader.cpp	Thu Feb 04 11:16:05 2016 +0000
@@ -57,7 +57,7 @@
 }
 
 CoreAudioFileReader::CoreAudioFileReader(FileSource source,
-                                         DecodeMode decodeMode,
+                                         DecodeMode /* decodeMode */,
                                          CacheMode mode,
                                          sv_samplerate_t targetRate,
                                          bool normalised,
@@ -180,7 +180,7 @@
         // buffers are interleaved unless specified otherwise
         addSamplesToDecodeCache((float *)m_d->buffer.mBuffers[0].mData, framesRead);
 
-        if (framesRead < m_d->blockSize) break;
+        if ((int)framesRead < m_d->blockSize) break;
     }
 
     finishDecodeCache();
@@ -196,7 +196,7 @@
 
     if (m_d->valid) {
         ExtAudioFileDispose(m_d->file);
-        delete[] m_d->buffer.mBuffers[0].mData;
+        delete[] (float *)(m_d->buffer.mBuffers[0].mData);
     }
 
     delete m_d;