comparison runner/LabFeatureWriter.cpp @ 176:59abb58b1855

TransformId is not sufficient -- it could be ambiguous (same transform id, different parameters etc). Use the whole transform

 
     int n = features.size();
 
     if (n == 0) return;
 
-    TrackTransformPair tt(trackId, transformId);
+    DataId tt(trackId, transform);
 
     if (m_pending.find(tt) != m_pending.end()) {
         writeFeature(stream, m_pending[tt], &features[0]);
         m_pending.erase(tt);
     }

 void
 LabFeatureWriter::finish()
 {
     for (PendingFeatures::const_iterator i = m_pending.begin();
          i != m_pending.end(); ++i) {
-        TrackTransformPair tt = i->first;
+        DataId tt = i->first;
         Plugin::Feature f = i->second;
-        QTextStream *sptr = getOutputStream(tt.first, tt.second);
+        QTextStream *sptr = getOutputStream(tt.first, tt.second.getIdentifier());
         if (!sptr) {
-            throw FailedToOpenOutputStream(tt.first, tt.second);
+            throw FailedToOpenOutputStream(tt.first, tt.second.getIdentifier());
         }
         QTextStream &stream = *sptr;
         // final feature has its own time as end time (we can't
         // reliably determine the end of audio file, and because of
         // the nature of block processing, the feature could even