Mercurial > hg > svcore

diff data/fileio/DecodingWavFileReader.cpp @ 1041:843f67be0ed9 cxx11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replace the get*Frames calls in AudioFileReader with less stupid API
author Chris Cannam
date Wed, 04 Mar 2015 12:30:41 +0000
parents a1cd5abcb38b
children 4d9816ba0ebe
line wrap: on
line diff
--- a/data/fileio/DecodingWavFileReader.cpp	Wed Mar 04 12:01:04 2015 +0000
+++ b/data/fileio/DecodingWavFileReader.cpp	Wed Mar 04 12:30:41 2015 +0000
@@ -74,7 +74,7 @@
             sv_frame_t count = blockSize;
             if (i + count > total) count = total - i;
 
-            m_original->getInterleavedFrames(i, count, block);
+            block = m_original->getInterleavedFrames(i, count);
             addBlock(block);
 
             if (m_cancelled) break;
@@ -131,7 +131,7 @@
         sv_frame_t count = blockSize;
         if (i + count > total) count = total - i;
         
-        m_reader->m_original->getInterleavedFrames(i, count, block);
+        block = m_reader->m_original->getInterleavedFrames(i, count);
         m_reader->addBlock(block);
 
         if (m_reader->m_cancelled) break;