diff runner/FeatureWriterFactory.cpp @ 171:c1834a31029c

Merge from branch "jams"

--- a/runner/FeatureWriterFactory.cpp	Wed Oct 15 13:06:27 2014 +0100
+++ b/runner/FeatureWriterFactory.cpp	Wed Oct 15 16:09:47 2014 +0100
@@ -23,6 +23,7 @@
 
 #include "AudioDBFeatureWriter.h"
 #include "MIDIFeatureWriter.h"
+#include "JAMSFeatureWriter.h"
 #include "LabFeatureWriter.h"
 
 set<string>
@@ -35,6 +36,7 @@
     tags.insert("csv");
     tags.insert("lab");
     tags.insert("midi");
+    tags.insert("json");
     return tags;
 }
 
@@ -53,6 +55,8 @@
         return new LabFeatureWriter();
     } else if (tag == "midi") {
         return new MIDIFeatureWriter();
+    } else if (tag == "json") {
+        return new JAMSFeatureWriter();
     }
 
     return 0;