comparison src/Analyser.cpp @ 223:d323b5d41570

Use CHP plugin for local frequency-constrained analysis

         myLayer->copy(m_pane, sel, m_preAnalysis);
     }
 
     TransformFactory *tf = TransformFactory::getInstance();
     
-    QString plugname = "pYIN";
+    QString plugname1 = "pYIN";
+    QString plugname2 = "CHP";
+
     QString base = "vamp:pyin:localcandidatepyin:";
     QString out = "pitchtrackcandidates";
 
     if (range.isConstrained()) {
-        base = "vamp:pyin:yinfc:";
-        out = "f0";
+        base = "vamp:chp:constrainedharmonicpeak:";
+        out = "peak";
     }
 
     Transforms transforms;
 
-    QString notFound = tr("Transform \"%1\" not found. Unable to perform interactive analysis.<br><br>Is the %2 Vamp plugin correctly installed?");
+    QString notFound = tr("Transform \"%1\" not found. Unable to perform interactive analysis.<br><br>Are the %2 and %3 Vamp plugins correctly installed?");
     if (!tf->haveTransform(base + out)) {
-	return notFound.arg(base + out).arg(plugname);
+	return notFound.arg(base + out).arg(plugname1).arg(plugname2);
     }
 
     Transform t = tf->getDefaultTransformFor
         (base + out, m_fileModel->getSampleRate());
     t.setStepSize(256);
     t.setBlockSize(2048);
 
     if (range.isConstrained()) {
         t.setParameter("minfreq", range.min);
         t.setParameter("maxfreq", range.max);
+        t.setBlockSize(4096);
     }
 
     RealTime start = RealTime::frame2RealTime
         (round(sel.getStartFrame()*1.0/256) * 256 - 4*256, m_fileModel->getSampleRate()); // 4*256 is for 4 frames offset due to timestamp shift