Mercurial > hg > sonic-annotator
diff runner/LabFeatureWriter.cpp @ 176:59abb58b1855
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 | 237ccacbb85e |
children | 089f1a13963d |
line wrap: on
line diff
--- a/runner/LabFeatureWriter.cpp Wed Oct 15 16:58:00 2014 +0100 +++ b/runner/LabFeatureWriter.cpp Wed Oct 15 17:02:48 2014 +0100 @@ -96,7 +96,7 @@ 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]); @@ -119,11 +119,11 @@ { 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