Mercurial > hg > svcore

diff data/fileio/CoreAudioFileReader.cpp @ 847:2d53205f70cd tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 26 Nov 2013 14:37:01 +0000
parents 54829c1e155e f5cd33909744
children f3cda3280398 59e7fe1b1003
line wrap: on
line diff
--- a/data/fileio/CoreAudioFileReader.cpp	Fri Nov 22 10:37:28 2013 +0000
+++ b/data/fileio/CoreAudioFileReader.cpp	Tue Nov 26 14:37:01 2013 +0000
@@ -77,7 +77,7 @@
 
     Profiler profiler("CoreAudioFileReader::CoreAudioFileReader", true);
 
-    SVDEBUG << "CoreAudioFileReader: path is \"" << m_path.toStdString() << "\"" << endl;
+    SVDEBUG << "CoreAudioFileReader: path is \"" << m_path << "\"" << endl;
 
     QByteArray ba = m_path.toLocal8Bit();
 
@@ -124,7 +124,7 @@
     m_channelCount = m_d->asbd.mChannelsPerFrame;
     m_fileRate = m_d->asbd.mSampleRate;
 
-    std::cerr << "CoreAudioReadStream: " << m_channelCount << " channels, " << m_fileRate << " Hz" << std::endl;
+    cerr << "CoreAudioReadStream: " << m_channelCount << " channels, " << m_fileRate << " Hz" << endl;
 
     m_d->asbd.mFormatID = kAudioFormatLinearPCM;
     m_d->asbd.mFormatFlags =
@@ -174,7 +174,7 @@
 
         //!!! progress?
 
-        //    std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl;
+        //    cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << endl;
 
         // buffers are interleaved unless specified otherwise
         addSamplesToDecodeCache((float *)m_d->buffer.mBuffers[0].mData, framesRead);
@@ -191,7 +191,7 @@
 
 CoreAudioFileReader::~CoreAudioFileReader()
 {
-    std::cerr << "CoreAudioFileReader::~CoreAudioFileReader" << std::endl;
+    cerr << "CoreAudioFileReader::~CoreAudioFileReader" << endl;
 
     if (m_d->valid) {
         ExtAudioFileDispose(m_d->file);