Mercurial > hg > svcore

diff data/fileio/CoreAudioFileReader.cpp @ 1206:659372323b45 tony-2.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge latest SV 3.0 branch code
author Chris Cannam
date Fri, 19 Aug 2016 15:58:57 +0100
parents 9c7633904ec2
children 0a9193dc136b
line wrap: on
line diff
--- a/data/fileio/CoreAudioFileReader.cpp	Tue Oct 20 12:54:06 2015 +0100
+++ b/data/fileio/CoreAudioFileReader.cpp	Fri Aug 19 15:58:57 2016 +0100
@@ -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;