Mercurial > hg > svcore

comparison data/fileio/OggVorbisFileReader.cpp @ 689:573d45e9487b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
48 m_decodeThread(0) 48 m_decodeThread(0)
49 { 49 {
50 m_channelCount = 0; 50 m_channelCount = 0;
51 m_fileRate = 0; 51 m_fileRate = 0;
52 52
53 // std::cerr << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << std::endl; 53 // DEBUG << "OggVorbisFileReader::OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (++instances) << " instances" << endl;
54 54
55 Profiler profiler("OggVorbisFileReader::OggVorbisFileReader", true); 55 Profiler profiler("OggVorbisFileReader::OggVorbisFileReader", true);
56 56
57 QFileInfo info(m_path); 57 QFileInfo info(m_path);
58 m_fileSize = info.size(); 58 m_fileSize = info.size();
100 } 100 }
101 } 101 }
102 102
103 OggVorbisFileReader::~OggVorbisFileReader() 103 OggVorbisFileReader::~OggVorbisFileReader()
104 { 104 {
105 // std::cerr << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << std::endl; 105 // DEBUG << "OggVorbisFileReader::~OggVorbisFileReader(" << m_path.toLocal8Bit().data() << "): now have " << (--instances) << " instances" << endl;
106 if (m_decodeThread) { 106 if (m_decodeThread) {
107 m_cancelled = true; 107 m_cancelled = true;
108 m_decodeThread->wait(); 108 m_decodeThread->wait();
109 delete m_decodeThread; 109 delete m_decodeThread;
110 } 110 }