comparison data/fft/FFTDataServer.cpp @ 1045:1a73618b0b67 cxx11

More type fixes, primarily in the spectrogram

                            int windowSize,
                            int windowIncrement,
                            int fftSize,
                            bool polar,
                            StorageAdviser::Criteria criteria,
-                           int fillFromColumn)
+                           sv_frame_t fillFromFrame)
 {
     QString n = generateFileBasename(model,
                                      channel,
                                      windowType,
                                      windowSize,

                                    windowSize,
                                    windowIncrement,
                                    fftSize,
                                    polar,
                                    criteria,
-                                   fillFromColumn);
+                                   fillFromFrame);
     } catch (InsufficientDiscSpace) {
         delete server;
         server = 0;
     }
 

                                 int windowSize,
                                 int windowIncrement,
                                 int fftSize,
                                 bool polar,
                                 StorageAdviser::Criteria criteria,
-                                int fillFromColumn)
+                                sv_frame_t fillFromFrame)
 {
     // Fuzzy matching:
     // 
     // -- if we're asked for polar and have non-polar, use it (and
     // vice versa).  This one is vital, and we do it for non-fuzzy as

                        windowSize,
                        windowIncrement,
                        fftSize,
                        polar,
                        criteria,
-                       fillFromColumn);
+                       fillFromFrame);
 }
 
 FFTDataServer *
 FFTDataServer::findServer(QString n)
 {    

 			     int windowSize,
 			     int windowIncrement,
 			     int fftSize,
                              bool polar,
                              StorageAdviser::Criteria criteria,
-                             int fillFromColumn) :
+                             sv_frame_t fillFromFrame) :
     m_fileBaseName(fileBaseName),
     m_model(model),
     m_channel(channel),
     m_windower(windowType, windowSize),
     m_windowSize(windowSize),

     if (!m_fftPlan) {
         cerr << "ERROR: fftf_plan_dft_r2c_1d(" << m_windowSize << ") failed!" << endl;
         throw(0);
     }
 
-    m_fillThread = new FillThread(*this, fillFromColumn);
+    m_fillThread = new FillThread(*this, fillFromFrame);
 }
 
 FFTDataServer::~FFTDataServer()
 {
 #ifdef DEBUG_FFT_SERVER