Mercurial > hg > match-vamp

diff src/MatchVampPlugin.h @ 107:a07b962e9f03 feature_conditioner

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use MatchPipeline in MatchVampPlugin
author Chris Cannam
date Thu, 04 Dec 2014 13:48:17 +0000
parents 593054bf6476
children 4b263ef50c9b cfba9aec7569
line wrap: on
line diff
--- a/src/MatchVampPlugin.h	Thu Dec 04 13:43:00 2014 +0000
+++ b/src/MatchVampPlugin.h	Thu Dec 04 13:48:17 2014 +0000
@@ -25,11 +25,7 @@
 #include <pthread.h>
 #endif
 
-#include "Matcher.h"
-#include "FeatureExtractor.h"
-#include "FeatureConditioner.h"
-
-class MatchFeatureFeeder;
+#include "MatchPipeline.h"
 
 class MatchVampPlugin : public Vamp::Plugin
 {
@@ -70,13 +66,7 @@
     void createMatchers();
     bool aboveThreshold(const float *);
 
-    Matcher *m_pm1;
-    Matcher *m_pm2;
-    FeatureExtractor *m_fe1;
-    FeatureExtractor *m_fe2;
-    FeatureConditioner *m_fc1;
-    FeatureConditioner *m_fc2;
-    MatchFeatureFeeder *m_feeder;
+    MatchPipeline *m_pipeline;
 
     Vamp::RealTime m_startTime;
     int m_stepSize;