Mercurial > hg > svcore

diff transform/CSVFeatureWriter.h @ 1006:d954e03274e8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TransformId is not sufficient -- it could be ambiguous (same transform id, different parameters etc). Use the whole transform
author Chris Cannam
date Wed, 15 Oct 2014 17:02:48 +0100
parents c2316a3bbb81
children 870acd589a38
line wrap: on
line diff
--- a/transform/CSVFeatureWriter.h	Wed Oct 15 16:05:15 2014 +0100
+++ b/transform/CSVFeatureWriter.h	Wed Oct 15 17:02:48 2014 +0100
@@ -63,15 +63,13 @@
     bool m_omitFilename;
     QString m_prevPrintedTrackId;
 
-    typedef map<TrackTransformPair, Vamp::Plugin::Feature> PendingFeatures;
-    typedef map<TrackTransformPair, std::string> PendingSummaryTypes;
+    typedef pair<QString, Transform> DataId; // track id, transform
+    typedef map<DataId, Vamp::Plugin::Feature> PendingFeatures;
+    typedef map<DataId, std::string> PendingSummaryTypes;
     PendingFeatures m_pending;
     PendingSummaryTypes m_pendingSummaryTypes;
 
-    typedef map<TransformId, float> SampleRateMap;
-    SampleRateMap m_rates;
-
-    void writeFeature(TrackTransformPair trackId,
+    void writeFeature(DataId,
                       QTextStream &,
                       const Vamp::Plugin::Feature &f,
                       const Vamp::Plugin::Feature *optionalNextFeature,