Mercurial > hg > svcore
comparison data/fileio/QuickTimeFileReader.cpp @ 689:573d45e9487b
Merge from debug-output branch
author | Chris Cannam |
---|---|
date | Tue, 14 Jun 2011 14:47:59 +0100 |
parents | 06f13a3b9e9e |
children | 1424aa29ae95 |
comparison
equal
deleted
inserted
replaced
688:be43b2fe68e8 | 689:573d45e9487b |
---|---|
64 m_channelCount = 0; | 64 m_channelCount = 0; |
65 m_fileRate = 0; | 65 m_fileRate = 0; |
66 | 66 |
67 Profiler profiler("QuickTimeFileReader::QuickTimeFileReader", true); | 67 Profiler profiler("QuickTimeFileReader::QuickTimeFileReader", true); |
68 | 68 |
69 std::cerr << "QuickTimeFileReader: path is \"" << m_path.toStdString() << "\"" << std::endl; | 69 DEBUG << "QuickTimeFileReader: path is \"" << m_path << "\"" << endl; |
70 | 70 |
71 long QTversion; | 71 long QTversion; |
72 | 72 |
73 #ifdef WIN32 | 73 #ifdef WIN32 |
74 InitializeQTML(0); // FIXME should check QT version | 74 InitializeQTML(0); // FIXME should check QT version |
263 m_decodeThread = new DecodeThread(this); | 263 m_decodeThread = new DecodeThread(this); |
264 m_decodeThread->start(); | 264 m_decodeThread->start(); |
265 } | 265 } |
266 } | 266 } |
267 | 267 |
268 std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error.toStdString() << "\"" << std::endl; | 268 std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << std::endl; |
269 } | 269 } |
270 | 270 |
271 QuickTimeFileReader::~QuickTimeFileReader() | 271 QuickTimeFileReader::~QuickTimeFileReader() |
272 { | 272 { |
273 std::cerr << "QuickTimeFileReader::~QuickTimeFileReader" << std::endl; | 273 DEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; |
274 | 274 |
275 if (m_decodeThread) { | 275 if (m_decodeThread) { |
276 m_cancelled = true; | 276 m_cancelled = true; |
277 m_decodeThread->wait(); | 277 m_decodeThread->wait(); |
278 delete m_decodeThread; | 278 delete m_decodeThread; |