Mercurial > hg > svapp

diff audioio/AudioGenerator.cpp @ 457:3485d324c172

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy dense time-value model API a bit; add first simple unit test for FFT model
author Chris Cannam
date Wed, 10 Jun 2015 17:06:02 +0100
parents c48bc6ddfe17
children 49c89950b06d
line wrap: on
line diff
--- a/audioio/AudioGenerator.cpp	Wed Jun 10 13:13:22 2015 +0100
+++ b/audioio/AudioGenerator.cpp	Wed Jun 10 17:06:02 2015 +0100
@@ -439,10 +439,10 @@
     sv_frame_t got = 0;
 
     if (startFrame >= fadeIn/2) {
-        got = dtvm->getData(0, modelChannels - 1,
-                            startFrame - fadeIn/2,
-                            frames + fadeOut/2 + fadeIn/2,
-                            m_channelBuffer);
+        got = dtvm->getMultiChannelData(0, modelChannels - 1,
+                                        startFrame - fadeIn/2,
+                                        frames + fadeOut/2 + fadeIn/2,
+                                        m_channelBuffer);
     } else {
         sv_frame_t missing = fadeIn/2 - startFrame;
 
@@ -457,10 +457,10 @@
                  << ", missing = " << missing << endl;
         }
 
-        got = dtvm->getData(0, modelChannels - 1,
-                            startFrame,
-                            frames + fadeOut/2,
-                            m_channelBuffer);
+        got = dtvm->getMultiChannelData(0, modelChannels - 1,
+                                        startFrame,
+                                        frames + fadeOut/2,
+                                        m_channelBuffer);
 
         for (int c = 0; c < modelChannels; ++c) {
             m_channelBuffer[c] -= missing;