Mercurial > hg > svcore
comparison data/fileio/QuickTimeFileReader.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | 3b00c1650490 |
children | f3cda3280398 59e7fe1b1003 |
comparison
equal
deleted
inserted
replaced
842:23d3a6eca5c3 | 843:e802e550a1f2 |
---|---|
147 return; | 147 return; |
148 } else if (!m_d->err && isProtected) { | 148 } else if (!m_d->err && isProtected) { |
149 m_error = QString("File is protected with DRM"); | 149 m_error = QString("File is protected with DRM"); |
150 return; | 150 return; |
151 } else if (m_d->err == kQTPropertyNotSupportedErr && !isProtected) { | 151 } else if (m_d->err == kQTPropertyNotSupportedErr && !isProtected) { |
152 std::cerr << "QuickTime: File is not protected with DRM" << std::endl; | 152 cerr << "QuickTime: File is not protected with DRM" << endl; |
153 } | 153 } |
154 | 154 |
155 if (m_d->movie) { | 155 if (m_d->movie) { |
156 SetMovieActive(m_d->movie, TRUE); | 156 SetMovieActive(m_d->movie, TRUE); |
157 m_d->err = GetMoviesError(); | 157 m_d->err = GetMoviesError(); |
184 } | 184 } |
185 | 185 |
186 m_channelCount = m_d->asbd.mChannelsPerFrame; | 186 m_channelCount = m_d->asbd.mChannelsPerFrame; |
187 m_fileRate = m_d->asbd.mSampleRate; | 187 m_fileRate = m_d->asbd.mSampleRate; |
188 | 188 |
189 std::cerr << "QuickTime: " << m_channelCount << " channels, " << m_fileRate << " kHz" << std::endl; | 189 cerr << "QuickTime: " << m_channelCount << " channels, " << m_fileRate << " kHz" << endl; |
190 | 190 |
191 m_d->asbd.mFormatFlags = | 191 m_d->asbd.mFormatFlags = |
192 kAudioFormatFlagIsFloat | | 192 kAudioFormatFlagIsFloat | |
193 kAudioFormatFlagIsPacked | | 193 kAudioFormatFlagIsPacked | |
194 kAudioFormatFlagsNativeEndian; | 194 kAudioFormatFlagsNativeEndian; |
238 break; | 238 break; |
239 } | 239 } |
240 | 240 |
241 //!!! progress? | 241 //!!! progress? |
242 | 242 |
243 // std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl; | 243 // cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << endl; |
244 | 244 |
245 // QuickTime buffers are interleaved unless specified otherwise | 245 // QuickTime buffers are interleaved unless specified otherwise |
246 addSamplesToDecodeCache(m_d->data, framesRead); | 246 addSamplesToDecodeCache(m_d->data, framesRead); |
247 | 247 |
248 if (framesRead < m_d->blockSize) break; | 248 if (framesRead < m_d->blockSize) break; |
265 m_decodeThread = new DecodeThread(this); | 265 m_decodeThread = new DecodeThread(this); |
266 m_decodeThread->start(); | 266 m_decodeThread->start(); |
267 } | 267 } |
268 } | 268 } |
269 | 269 |
270 std::cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << std::endl; | 270 cerr << "QuickTimeFileReader::QuickTimeFileReader: frame count is now " << getFrameCount() << ", error is \"\"" << m_error << "\"" << endl; |
271 } | 271 } |
272 | 272 |
273 QuickTimeFileReader::~QuickTimeFileReader() | 273 QuickTimeFileReader::~QuickTimeFileReader() |
274 { | 274 { |
275 SVDEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; | 275 SVDEBUG << "QuickTimeFileReader::~QuickTimeFileReader" << endl; |