comparison data/fileio/WavFileReader.cpp @ 690:1424aa29ae95

Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)
author Chris Cannam
date Tue, 14 Jun 2011 15:26:52 +0100
parents 06f13a3b9e9e
children 459235dccff6
comparison
equal deleted inserted replaced
689:573d45e9487b 690:1424aa29ae95
83 std::cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" (" 83 std::cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" ("
84 << sf_strerror(m_file) << ")" << std::endl; 84 << sf_strerror(m_file) << ")" << std::endl;
85 } 85 }
86 } 86 }
87 87
88 // DEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl; 88 // SVDEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl;
89 89
90 m_frameCount = m_fileInfo.frames; 90 m_frameCount = m_fileInfo.frames;
91 91
92 if (m_channelCount == 0) { 92 if (m_channelCount == 0) {
93 m_channelCount = m_fileInfo.channels; 93 m_channelCount = m_fileInfo.channels;
120 if (!m_file || !m_channelCount) { 120 if (!m_file || !m_channelCount) {
121 return; 121 return;
122 } 122 }
123 123
124 if ((long)start >= m_fileInfo.frames) { 124 if ((long)start >= m_fileInfo.frames) {
125 // DEBUG << "WavFileReader::getInterleavedFrames: " << start 125 // SVDEBUG << "WavFileReader::getInterleavedFrames: " << start
126 // << " > " << m_fileInfo.frames << endl; 126 // << " > " << m_fileInfo.frames << endl;
127 return; 127 return;
128 } 128 }
129 129
130 if (long(start + count) > m_fileInfo.frames) { 130 if (long(start + count) > m_fileInfo.frames) {