comparison audioio/PhaseVocoderTimeStretcher.cpp @ 18:c1aee08c60b1

* avoid using n2 in processBlock

                 assert(got == m_wlen);
 		
                 bool thisChannelPercussive =
                     processBlock(c, m_dbuf, m_mashbuf[c],
                                  c == 0 ? m_modulationbuf : 0,
-                                 m_prevPercussive);
+                                 m_prevPercussive ? m_n1 : m_n2);
 
                 if (thisChannelPercussive && c == 0) {
                     isPercussive = true;
                 } 
 

 
 bool
 PhaseVocoderTimeStretcher::processBlock(size_t c,
                                         float *buf, float *out,
                                         float *modulation,
-                                        bool lastPercussive)
+                                        size_t lastStep)
 {
     size_t i;
     bool isPercussive = false;
 
     // buf contains m_wlen samples; out contains enough space for

         }
 
         m_prevPercussiveCount[c] = count;
     }
 
-    size_t n2 = m_n2;
-    if (lastPercussive) n2 = m_n1;
-	
     for (i = 0; i < m_wlen; ++i) {
 
         float mag;
 
         if (m_sharpen && c == 0) {

 
         float phaseError = princargf(phase - expectedPhase);
 
         float phaseIncrement = (omega + phaseError) / m_n1;
 
-        float adjustedPhase = m_prevAdjustedPhase[c][i] + n2 * phaseIncrement;
+        float adjustedPhase = m_prevAdjustedPhase[c][i] +
+            lastStep * phaseIncrement;
 
         if (isPercussive) adjustedPhase = phase;
 	
 	float real = mag * cosf(adjustedPhase);
 	float imag = mag * sinf(adjustedPhase);