comparison src/Silvet.cpp @ 189:3de7c871d9c8 noteagent

Fixes to mono feeder; use it for monophonic instruments

 
 #include <cq/CQSpectrogram.h>
 
 #include "MedianFilter.h"
 #include "AgentFeederPoly.h"
+#include "AgentFeederMono.h"
 #include "NoteHypothesis.h"
 
 #include "constant-q-cpp/src/dsp/Resampler.h"
 
 #include <vector>

 
     for (int i = 0; i < (int)m_postFilter.size(); ++i) {
         delete m_postFilter[i];
     }
     m_postFilter.clear();
-    for (int i = 0; i < m_instruments[0].templateNoteCount; ++i) {
+    for (int i = 0; i < m_instruments[m_instrument].templateNoteCount; ++i) {
 //!!!        m_postFilter.push_back(new MedianFilter<double>(3));
         m_postFilter.push_back(new MedianFilter<double>(1));//!!!
     }
 
     m_columnCountIn = 0;
     m_columnCountOut = 0;
     m_startTime = RealTime::zeroTime;
 
-    m_agentFeeder = new AgentFeederPoly<NoteHypothesis>();
+    if (m_instruments[m_instrument].maxPolyphony == 1) {
+        m_agentFeeder = new AgentFeederMono<NoteHypothesis>();
+    } else {
+        m_agentFeeder = new AgentFeederPoly<NoteHypothesis>();
+    }
 }
 
 Silvet::FeatureSet
 Silvet::process(const float *const *inputBuffers, Vamp::RealTime timestamp)
 {

 Vamp::Plugin::FeatureList
 Silvet::obtainNotes()
 {        
     FeatureList noteFeatures;
 
-    typedef AgentFeederPoly<NoteHypothesis> NoteFeeder;
-
-    NoteFeeder *feeder = dynamic_cast<NoteFeeder *>(m_agentFeeder);
-
-    if (!feeder) {
-        cerr << "INTERNAL ERROR: Feeder is not a poly-note-hypothesis-feeder!"
-             << endl;
+    std::set<NoteHypothesis> hh;
+
+    AgentFeederPoly<NoteHypothesis> *polyFeeder = 
+        dynamic_cast<AgentFeederPoly<NoteHypothesis> *>(m_agentFeeder);
+
+    AgentFeederMono<NoteHypothesis> *monoFeeder = 
+        dynamic_cast<AgentFeederMono<NoteHypothesis> *>(m_agentFeeder);
+
+    if (polyFeeder) {
+
+        hh = polyFeeder->retrieveAcceptedHypotheses();
+
+    } else if (monoFeeder) {
+
+        hh = monoFeeder->retrieveAcceptedHypotheses();
+
+    } else {
+
+        cerr << "INTERNAL ERROR: Feeder is neither poly- nor "
+             << "mono-note-hypothesis-feeder!" << endl;
         return noteFeatures;
     }
 
-    std::set<NoteHypothesis> hh = feeder->retrieveAcceptedHypotheses();
-
-    //!!! inefficient
     for (std::set<NoteHypothesis>::const_iterator hi = hh.begin();
          hi != hh.end(); ++hi) { 
 
         NoteHypothesis h(*hi);