Mercurial > hg > svcore
comparison transform/FileFeatureWriter.cpp @ 1037:bf0e5944289b cxx11
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 03 Mar 2015 09:33:59 +0000 |
parents | d74ebd2d2c49 |
children | c7f1300dbf64 |
comparison
equal
deleted
inserted
replaced
1027:ce1077bd663a | 1037:bf0e5944289b |
---|---|
313 return m_files[key]; | 313 return m_files[key]; |
314 } | 314 } |
315 | 315 |
316 | 316 |
317 QTextStream *FileFeatureWriter::getOutputStream(QString trackId, | 317 QTextStream *FileFeatureWriter::getOutputStream(QString trackId, |
318 TransformId transformId) | 318 TransformId transformId, |
319 QTextCodec *codec) | |
319 { | 320 { |
320 QFile *file = getOutputFile(trackId, transformId); | 321 QFile *file = getOutputFile(trackId, transformId); |
321 if (!file && !m_stdout) { | 322 if (!file && !m_stdout) { |
322 return 0; | 323 return 0; |
323 } | 324 } |
326 if (m_stdout) { | 327 if (m_stdout) { |
327 m_streams[file] = new QTextStream(stdout); | 328 m_streams[file] = new QTextStream(stdout); |
328 } else { | 329 } else { |
329 m_streams[file] = new QTextStream(file); | 330 m_streams[file] = new QTextStream(file); |
330 } | 331 } |
332 m_streams[file]->setCodec(codec); | |
331 } | 333 } |
332 | 334 |
333 QTextStream *stream = m_streams[file]; | 335 QTextStream *stream = m_streams[file]; |
334 | 336 |
335 if (m_prevstream && stream != m_prevstream) { | 337 if (m_prevstream && stream != m_prevstream) { |