Mercurial > hg > sonic-annotator
comparison runner/FeatureWriterFactory.cpp @ 171:c1834a31029c
Merge from branch "jams"
author | Chris Cannam |
---|---|
date | Wed, 15 Oct 2014 16:09:47 +0100 |
parents | 4b19d824a213 |
children | f35bbb3e4d41 |
comparison
equal
deleted
inserted
replaced
163:f4f770b4356b | 171:c1834a31029c |
---|---|
21 #include "rdf/RDFFeatureWriter.h" | 21 #include "rdf/RDFFeatureWriter.h" |
22 #include "transform/CSVFeatureWriter.h" | 22 #include "transform/CSVFeatureWriter.h" |
23 | 23 |
24 #include "AudioDBFeatureWriter.h" | 24 #include "AudioDBFeatureWriter.h" |
25 #include "MIDIFeatureWriter.h" | 25 #include "MIDIFeatureWriter.h" |
26 #include "JAMSFeatureWriter.h" | |
26 #include "LabFeatureWriter.h" | 27 #include "LabFeatureWriter.h" |
27 | 28 |
28 set<string> | 29 set<string> |
29 FeatureWriterFactory::getWriterTags() | 30 FeatureWriterFactory::getWriterTags() |
30 { | 31 { |
33 tags.insert("rdf"); | 34 tags.insert("rdf"); |
34 tags.insert("audiodb"); | 35 tags.insert("audiodb"); |
35 tags.insert("csv"); | 36 tags.insert("csv"); |
36 tags.insert("lab"); | 37 tags.insert("lab"); |
37 tags.insert("midi"); | 38 tags.insert("midi"); |
39 tags.insert("json"); | |
38 return tags; | 40 return tags; |
39 } | 41 } |
40 | 42 |
41 FeatureWriter * | 43 FeatureWriter * |
42 FeatureWriterFactory::createWriter(string tag) | 44 FeatureWriterFactory::createWriter(string tag) |
51 return new CSVFeatureWriter(); | 53 return new CSVFeatureWriter(); |
52 } else if (tag == "lab") { | 54 } else if (tag == "lab") { |
53 return new LabFeatureWriter(); | 55 return new LabFeatureWriter(); |
54 } else if (tag == "midi") { | 56 } else if (tag == "midi") { |
55 return new MIDIFeatureWriter(); | 57 return new MIDIFeatureWriter(); |
58 } else if (tag == "json") { | |
59 return new JAMSFeatureWriter(); | |
56 } | 60 } |
57 | 61 |
58 return 0; | 62 return 0; |
59 } | 63 } |