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

Merge from default branch

 
     m_d->buffer.mBuffers[0].mData = 0;
 
     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();
 
     CFURLRef url = CFURLCreateFromFileSystemRepresentation
         (kCFAllocatorDefault,

     }
 	
     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 =
         kAudioFormatFlagIsFloat |
         kAudioFormatFlagIsPacked |

             break;
         }
 
         //!!! 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);
 
         if (framesRead < m_d->blockSize) break;

 }
 
 
 CoreAudioFileReader::~CoreAudioFileReader()
 {
-    std::cerr << "CoreAudioFileReader::~CoreAudioFileReader" << std::endl;
+    cerr << "CoreAudioFileReader::~CoreAudioFileReader" << endl;
 
     if (m_d->valid) {
         ExtAudioFileDispose(m_d->file);
         delete[] m_d->buffer.mBuffers[0].mData;
     }