changeset 78:9918c8a3f904

* Omit translucent blue fill for selection rectangles that are superimposed over layers that use colours for meaningful purposes such as the spectrogram (CHARM change request)
author Chris Cannam
date Fri, 24 Nov 2006 16:56:15 +0000 (2006-11-24)
parents bedc7517b6e8
children c1318aac18d2
files audioio/PhaseVocoderTimeStretcher.cpp
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/PhaseVocoderTimeStretcher.cpp	Fri Nov 17 16:27:39 2006 +0000
+++ b/audioio/PhaseVocoderTimeStretcher.cpp	Fri Nov 24 16:56:15 2006 +0000
@@ -571,9 +571,6 @@
 
         if (!unchanged) {
 
-            float mag = sqrtf(m_freq[c][i][0] * m_freq[c][i][0] +
-                              m_freq[c][i][1] * m_freq[c][i][1]);
-
             float omega = (2 * M_PI * m_n1 * i) / m_wlen;
 	
             float expectedPhase = m_prevPhase[c][i] + omega;
@@ -585,6 +582,9 @@
             adjustedPhase = m_prevAdjustedPhase[c][i] +
                 lastStep * phaseIncrement;
             
+            float mag = sqrtf(m_freq[c][i][0] * m_freq[c][i][0] +
+                              m_freq[c][i][1] * m_freq[c][i][1]);
+            
             float real = mag * cosf(adjustedPhase);
             float imag = mag * sinf(adjustedPhase);
             m_freq[c][i][0] = real;