comparison src/vamp-hostsdk/PluginInputDomainAdapter.cpp @ 501:90571dcc371a vamp-kiss-naming

Extensively rename things in the KissFFT headers to use a Vamp prefix. The motivation is not to change anything about the Vamp SDK library builds, but to avoid confusion in case any other code (for example that pulls in the Vamp SDK as part of a wider project definition) accidentally includes these headers instead of, or as well as, some other copy of KissFFT.

     float m_inputSampleRate;
     int m_channels;
     int m_stepSize;
     int m_blockSize;
     float **m_freqbuf;
-    Kiss::kiss_fft_scalar *m_ri;
+    Kiss::vamp_kiss_fft_scalar *m_ri;
 
     WindowType m_windowType;
-    typedef Window<Kiss::kiss_fft_scalar> W;
+    typedef Window<Kiss::vamp_kiss_fft_scalar> W;
     W *m_window;
 
     ProcessTimestampMethod m_method;
     int m_processCount;
     float **m_shiftBuffers;
 
-    Kiss::kiss_fftr_cfg m_cfg;
-    Kiss::kiss_fft_cpx *m_cbuf;
+    Kiss::vamp_kiss_fftr_cfg m_cfg;
+    Kiss::vamp_kiss_fft_cpx *m_cbuf;
 
     FeatureSet processShiftingTimestamp(const float *const *inputBuffers, RealTime timestamp);
     FeatureSet processShiftingData(const float *const *inputBuffers, RealTime timestamp);
 
     size_t makeBlockSizeAcceptable(size_t) const;

             delete[] m_freqbuf[c];
         }
         delete[] m_freqbuf;
         delete[] m_ri;
         if (m_cfg) {
-            Kiss::kiss_fftr_free(m_cfg);
+            Kiss::vamp_kiss_fftr_free(m_cfg);
             m_cfg = 0;
             delete[] m_cbuf;
             m_cbuf = 0;
         }
         delete m_window;

             delete[] m_freqbuf[c];
         }
         delete[] m_freqbuf;
         delete[] m_ri;
         if (m_cfg) {
-            Kiss::kiss_fftr_free(m_cfg);
+            Kiss::vamp_kiss_fftr_free(m_cfg);
             m_cfg = 0;
             delete[] m_cbuf;
             m_cbuf = 0;
         }
         delete m_window;

 
     m_freqbuf = new float *[m_channels];
     for (int c = 0; c < m_channels; ++c) {
         m_freqbuf[c] = new float[m_blockSize + 2];
     }
-    m_ri = new Kiss::kiss_fft_scalar[m_blockSize];
+    m_ri = new Kiss::vamp_kiss_fft_scalar[m_blockSize];
 
     m_window = new W(convertType(m_windowType), m_blockSize);
 
-    m_cfg = Kiss::kiss_fftr_alloc(m_blockSize, false, 0, 0);
-    m_cbuf = new Kiss::kiss_fft_cpx[m_blockSize/2+1];
+    m_cfg = Kiss::vamp_kiss_fftr_alloc(m_blockSize, false, 0, 0);
+    m_cbuf = new Kiss::vamp_kiss_fft_cpx[m_blockSize/2+1];
 
     m_processCount = 0;
 
     return m_plugin->initialise(channels, stepSize, m_blockSize);
 }

 
         m_window->cut(inputBuffers[c], m_ri);
 
         for (int i = 0; i < m_blockSize/2; ++i) {
             // FFT shift
-            Kiss::kiss_fft_scalar value = m_ri[i];
+            Kiss::vamp_kiss_fft_scalar value = m_ri[i];
             m_ri[i] = m_ri[i + m_blockSize/2];
             m_ri[i + m_blockSize/2] = value;
         }
 
-        Kiss::kiss_fftr(m_cfg, m_ri, m_cbuf);
+        Kiss::vamp_kiss_fftr(m_cfg, m_ri, m_cbuf);
         
         for (int i = 0; i <= m_blockSize/2; ++i) {
             m_freqbuf[c][i * 2] = float(m_cbuf[i].r);
             m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i].i);
         }

 
         m_window->cut(m_shiftBuffers[c], m_ri);
 
         for (int i = 0; i < m_blockSize/2; ++i) {
             // FFT shift
-            Kiss::kiss_fft_scalar value = m_ri[i];
+            Kiss::vamp_kiss_fft_scalar value = m_ri[i];
             m_ri[i] = m_ri[i + m_blockSize/2];
             m_ri[i + m_blockSize/2] = value;
         }
 
-        Kiss::kiss_fftr(m_cfg, m_ri, m_cbuf);
+        Kiss::vamp_kiss_fftr(m_cfg, m_ri, m_cbuf);
         
         for (int i = 0; i <= m_blockSize/2; ++i) {
             m_freqbuf[c][i * 2] = float(m_cbuf[i].r);
             m_freqbuf[c][i * 2 + 1] = float(m_cbuf[i].i);
         }