Mercurial > hg > match-vamp

diff MatchVampPlugin.h @ 17:27f418d77095

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Store parameters object
author Chris Cannam
date Fri, 10 Oct 2014 14:01:43 +0100
parents 4c8526c5bf58
children 37c0b59fd514
line wrap: on
line diff
--- a/MatchVampPlugin.h	Fri Oct 10 13:16:54 2014 +0100
+++ b/MatchVampPlugin.h	Fri Oct 10 14:01:43 2014 +0100
@@ -25,7 +25,8 @@
 #include <pthread.h>
 #endif
 
-class Matcher;
+#include "Matcher.h"
+
 class MatchFeeder;
 
 class MatchVampPlugin : public Vamp::Plugin
@@ -64,11 +65,11 @@
     FeatureSet getRemainingFeatures();
 
 protected:
-    void createMatchers() const;
+    void createMatchers();
 
-    mutable Matcher *pm1;
-    mutable Matcher *pm2;
-    mutable MatchFeeder *feeder;
+    Matcher *pm1;
+    Matcher *pm2;
+    MatchFeeder *feeder;
 
     Vamp::RealTime m_startTime;
     int m_stepSize;
@@ -78,6 +79,9 @@
     bool m_begin;
     bool m_locked;
 
+    Matcher::Parameters m_params;
+    Matcher::Parameters m_defaultParams;
+
     mutable int m_pathOutNo;
     mutable int m_abOutNo;
     mutable int m_baOutNo;