Mercurial > hg > sonic-annotator
diff runner/JAMSFeatureWriter.h @ 152:db83ea0e102d jams
Make the JSON well-formed (though still empty), except in the case where we are asked to write more than one file's features to the same output file or stdout
author | Chris Cannam |
---|---|
date | Tue, 14 Oct 2014 12:35:19 +0100 |
parents | 3921e0c1f4dd |
children | d0be35a305cc |
line wrap: on
line diff
--- a/runner/JAMSFeatureWriter.h Tue Oct 14 11:27:43 2014 +0100 +++ b/runner/JAMSFeatureWriter.h Tue Oct 14 12:35:19 2014 +0100 @@ -65,13 +65,14 @@ typedef map<QString, QString> TrackMetadataMap; // track id -> json object TrackMetadataMap m_metadata; + typedef map<TrackTransformPair, QString> DataMap; + DataMap m_data; + typedef map<QString, Task> TaskMap; // by transform id TaskMap m_tasks; - //!!! no -- need to map track-transform (could have same transform for many tracks) - typedef set<QString> StartedSet; // transform or track id - StartedSet m_startedTracks; - StartedSet m_startedTransforms; + typedef set<TrackTransformPair> StartedSet; + StartedSet m_startedTargets; void loadRDFDescription(const Transform &); void identifyTask(const Transform &);