fix: Added support for AudioBlockView changes to dsp modules (delay, …

…PCM).
AkiyukiOkayasu · Dec 16, 2021 · ff3859b · ff3859b
1 parent a13b358
commit ff3859b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/include/ame_Delay.hpp b/include/ame_Delay.hpp
@@ -47,20 +47,19 @@ class Delay
     }
 
     /// Process audio effect.
-    template <typename SampleType>
-    void process (AudioBlockView<SampleType>& block)
+    template <typename SampleType, size_t N>
+    void process (AudioBlockView<SampleType, N>& block)
     {
         assert (block.getNumChannels() <= MaximumChannels);
 
-        auto buffer = block.getWritePointer();
         uint_fast32_t i = 0;
-        for (uint_fast32_t samp = 0; samp < block.getNumSamples(); ++samp)
+        for (uint_fast32_t samp = 0; samp < block.getNumSamplesPerChannel(); ++samp)
         {
             for (uint_fast32_t ch = 0; ch < block.getNumChannels(); ++ch)
             {
-                const float input = buffer[i];
+                const float input = block.view[i];
                 delayLine[ch][writePos.get()] = input;
-                buffer[i] = lerp (delayLine[ch][readPos.get()], delayLine[ch][readPos.get (-1)], fractional);
+                block.view[i] = lerp (delayLine[ch][readPos.get()], delayLine[ch][readPos.get (-1)], fractional);
                 ++i;
             }
             ++readPos;

diff --git a/include/ame_Pcm.hpp b/include/ame_Pcm.hpp
@@ -281,8 +281,8 @@ class WavPlayer
         @tparam FloatType float or double
         @param block dest
     */
-    template <typename FloatType>
-    void process (AudioBlockView<FloatType>& block)
+    template <typename FloatType, size_t N>
+    void process (AudioBlockView<FloatType, N>& block)
     {
         if (playing.load() == false)
         {
@@ -298,7 +298,8 @@ class WavPlayer
             case fmt::wFormatTag::PCM:
             {
                 auto offset = (bitRate / 8) * numChannels * readPosition.load();
-                for (uint_fast32_t samp = 0; samp < block.getNumSamples(); ++samp)
+                const auto nSamp = block.getNumSamplesPerChannel();
+                for (uint_fast32_t samp = 0; samp < nSamp; ++samp)
                 {
                     if (readPosition + samp >= numSamples)
                     {
@@ -320,7 +321,7 @@ class WavPlayer
                         block.addSample (ch, samp, s);
                     }
                 }
-                readPosition += block.getNumSamples();
+                readPosition += nSamp;
                 break;
             }
             case fmt::wFormatTag::ImaAdpcm: