comparison src/Silvet.cpp @ 303:d8468176339d livemode

More adjustments for live mode, including actually *using* the max frequency we calculated earlier

             float((shiftCount - shift) - int(shiftCount / 2) - 1) / shiftCount;
     }
 
     float freq = float(27.5 * pow(2.0, (note + pshift) / 12.0));
 
-    cerr << "note = " << note << ", shift = " << shift << ", shiftCount = "
-         << shiftCount << ", obtained freq = " << freq << endl;
+//    cerr << "note = " << note << ", shift = " << shift << ", shiftCount = "
+//         << shiftCount << ", obtained freq = " << freq << endl;
     
     return freq;
 }
 
 bool

     int bpo = 12 *
         (m_mode == LiveMode ? binsPerSemitoneLive : binsPerSemitoneNormal);
 
     CQParameters params(processingSampleRate,
                         minFreq, 
-                        processingSampleRate / 3,
+                        maxFreq,
                         bpo);
 
     params.q = 0.95; // MIREX code uses 0.8, but it seems 0.9 or lower
                      // drops the FFT size to 512 from 1024 and alters
                      // some other processing parameters, making

     params.threshold = 0.0005;
     params.window = CQParameters::Hann;
 
     m_cq = new CQSpectrogram(params, CQSpectrogram::InterpolateLinear);
 
-    cerr << "CQ bins = " << m_cq->getTotalBins() << endl;
-    cerr << "CQ min freq = " << m_cq->getMinFrequency() << " (and for confirmation, freq of bin 0 = " << m_cq->getBinFrequency(0) << ")" << endl;
+//    cerr << "CQ bins = " << m_cq->getTotalBins() << endl;
+//    cerr << "CQ min freq = " << m_cq->getMinFrequency() << " (and for confirmation, freq of bin 0 = " << m_cq->getBinFrequency(0) << ")" << endl;
     
     m_colsPerSec = (m_mode == DraftMode ? 25 : 50);
 
     for (int i = 0; i < (int)m_postFilter.size(); ++i) {
         delete m_postFilter[i];
     }
     m_postFilter.clear();
+    int postFilterLength = 3;
     for (int i = 0; i < getPack(0).templateNoteCount; ++i) {
-        m_postFilter.push_back(new MedianFilter<double>(3));
+        m_postFilter.push_back(new MedianFilter<double>(postFilterLength));
     }
     m_pianoRoll.clear();
     m_inputGains.clear();
     m_columnCount = 0;
     m_resampledCount = 0;

                 partShift = shift;
                 partVelocity = 0;
             }
         }
 
-        int v = round(strength * 2);
+        int v;
+        if (m_mode == LiveMode) {
+            v = round(strength * 30);
+        } else {
+            v = round(strength * 2);
+        }
         if (v > partVelocity) {
             partVelocity = v;
         }
     }