# HG changeset patch # User Chris Cannam # Date 1433952362 -3600 # Node ID 3485d324c172e92e6f47156ef586692fc28b0c36 # Parent 8125b8cb8128b71ba9eb0759a8774c8038cd16e8 Tidy dense time-value model API a bit; add first simple unit test for FFT model diff -r 8125b8cb8128 -r 3485d324c172 audioio/AudioGenerator.cpp --- 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;