changeset 136:2260947be4aa midi

Stub out MIDI export
author Chris Cannam
date Mon, 13 Oct 2014 10:56:27 +0100
parents caf05503bf42
children 65a488d8c1bb
files .hgsubstate runner.pro runner/FeatureWriterFactory.cpp tests/include.sh
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Oct 13 10:16:37 2014 +0100
+++ b/.hgsubstate	Mon Oct 13 10:56:27 2014 +0100
@@ -1,3 +1,3 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
-952005e252668fecdee23fed6227c52ba28cf0a3 svcore
+2104ea2204d2b8e5f19401526d8009ac8eba63ea svcore
--- a/runner.pro	Mon Oct 13 10:16:37 2014 +0100
+++ b/runner.pro	Mon Oct 13 10:56:27 2014 +0100
@@ -53,8 +53,8 @@
 
 TARGET = sonic-annotator
 
-DEPENDPATH += . svcore
-INCLUDEPATH += . dataquay svcore
+DEPENDPATH += . svcore runner
+INCLUDEPATH += . dataquay svcore runner
 
 QMAKE_LIBDIR = svcore $$QMAKE_LIBDIR
 
@@ -84,6 +84,7 @@
         runner/FeatureWriterFactory.h  \
         runner/DefaultFeatureWriter.h \
         runner/FeatureExtractionManager.h \
+        runner/MIDIFeatureWriter.h \
         runner/MultiplexedReader.h
 
 SOURCES += \
@@ -92,6 +93,7 @@
 	runner/FeatureExtractionManager.cpp \
         runner/AudioDBFeatureWriter.cpp \
         runner/FeatureWriterFactory.cpp \
+        runner/MIDIFeatureWriter.cpp \
         runner/MultiplexedReader.cpp
 
 !win32 {
--- a/runner/FeatureWriterFactory.cpp	Mon Oct 13 10:16:37 2014 +0100
+++ b/runner/FeatureWriterFactory.cpp	Mon Oct 13 10:56:27 2014 +0100
@@ -19,6 +19,7 @@
 #include "DefaultFeatureWriter.h"
 #include "rdf/RDFFeatureWriter.h"
 #include "AudioDBFeatureWriter.h"
+#include "MIDIFeatureWriter.h"
 #include "transform/CSVFeatureWriter.h"
 
 set<string>
@@ -29,6 +30,7 @@
     tags.insert("rdf");
     tags.insert("audiodb");
     tags.insert("csv");
+    tags.insert("midi");
     return tags;
 }
 
@@ -43,6 +45,8 @@
         return new AudioDBFeatureWriter();
     } else if (tag == "csv") {
         return new CSVFeatureWriter();
+    } else if (tag == "midi") {
+        return new MIDIFeatureWriter();
     }
 
     return 0;
--- a/tests/include.sh	Mon Oct 13 10:16:37 2014 +0100
+++ b/tests/include.sh	Mon Oct 13 10:56:27 2014 +0100
@@ -4,7 +4,7 @@
 testdir=$mypath/..
 r=$testdir/../sonic-annotator
 
-version=1.1
+version=1.1-hg
 
 audiopath=$testdir/audio