diff runner/FeatureWriterFactory.cpp @ 161:4b19d824a213 jams

Merge from default branch

--- a/runner/FeatureWriterFactory.cpp	Tue Oct 14 14:03:34 2014 +0100
+++ b/runner/FeatureWriterFactory.cpp	Wed Oct 15 11:33:14 2014 +0100
@@ -17,11 +17,14 @@
 #include "FeatureWriterFactory.h"
 
 #include "DefaultFeatureWriter.h"
+
 #include "rdf/RDFFeatureWriter.h"
+#include "transform/CSVFeatureWriter.h"
+
 #include "AudioDBFeatureWriter.h"
 #include "MIDIFeatureWriter.h"
 #include "JAMSFeatureWriter.h"
-#include "transform/CSVFeatureWriter.h"
+#include "LabFeatureWriter.h"
 
 set<string>
 FeatureWriterFactory::getWriterTags()
@@ -31,6 +34,7 @@
     tags.insert("rdf");
     tags.insert("audiodb");
     tags.insert("csv");
+    tags.insert("lab");
     tags.insert("midi");
     tags.insert("json");
     return tags;
@@ -47,6 +51,8 @@
         return new AudioDBFeatureWriter();
     } else if (tag == "csv") {
         return new CSVFeatureWriter();
+    } else if (tag == "lab") {
+        return new LabFeatureWriter();
     } else if (tag == "midi") {
         return new MIDIFeatureWriter();
     } else if (tag == "json") {