From ffa96a342f0ce823a2a53ae9f3da5469c2528107 Mon Sep 17 00:00:00 2001 From: Chris Cannam Date: Fri, 3 Jul 2020 17:38:25 +0100 Subject: [PATCH] Update MATCH code to include (but not yet use) subsequence plugin --- match.pro | 7 ++++++- repoint-lock.json | 2 +- repoint-project.json | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/match.pro b/match.pro index a7f03e7..dca0098 100644 --- a/match.pro +++ b/match.pro @@ -40,11 +40,14 @@ SOURCES += \ match/src/FeatureConditioner.cpp \ match/src/FeatureExtractor.cpp \ match/src/Finder.cpp \ + match/src/FullDTW.cpp \ match/src/Matcher.cpp \ match/src/MatchFeatureFeeder.cpp \ match/src/MatchPipeline.cpp \ match/src/MatchVampPlugin.cpp \ match/src/Path.cpp \ + match/src/SubsequenceMatchVampPlugin.cpp \ + match/src/libmain.cpp \ vamp-plugin-sdk/src/vamp-sdk/FFT.cpp \ vamp-plugin-sdk/src/vamp-sdk/PluginAdapter.cpp \ vamp-plugin-sdk/src/vamp-sdk/RealTime.cpp @@ -54,11 +57,13 @@ HEADERS += \ match/src/FeatureConditioner.h \ match/src/FeatureExtractor.h \ match/src/Finder.h \ + match/src/FullDTW.h \ match/src/Matcher.h \ match/src/MatchFeatureFeeder.h \ match/src/MatchPipeline.h \ match/src/MatchTypes.h \ match/src/MatchVampPlugin.h \ - match/src/Path.h + match/src/Path.h \ + match/src/SubsequenceMatchVampPlugin.h diff --git a/repoint-lock.json b/repoint-lock.json index 9e193e8..4741de6 100644 --- a/repoint-lock.json +++ b/repoint-lock.json @@ -49,7 +49,7 @@ "pin": "fd0ace21dce3" }, "match": { - "pin": "4b272c839f7e" + "pin": "2f3ecf5d2651" }, "constant-q-cpp": { "pin": "7ac84048e3e43c433d88e12d221af15e50f41591" diff --git a/repoint-project.json b/repoint-project.json index 29b0dfb..c29ef53 100644 --- a/repoint-project.json +++ b/repoint-project.json @@ -88,7 +88,8 @@ "match": { "vcs": "hg", "service": "soundsoftware", - "repository": "match-vamp" + "repository": "match-vamp", + "branch": "subsequence" }, "constant-q-cpp": { "vcs": "git",