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

Merge from debug-output branch

     m_fileInfo.frames = 0;
     m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
 
     if (!m_file || (!fileUpdating && m_fileInfo.channels <= 0)) {
 	std::cerr << "WavFileReader::initialize: Failed to open file at \""
-                  << m_path.toStdString() << "\" ("
+                  << m_path << "\" ("
 		  << sf_strerror(m_file) << ")" << std::endl;
 
 	if (m_file) {
 	    m_error = QString("Couldn't load audio file '%1':\n%2")
 		.arg(m_path).arg(sf_strerror(m_file));

 
     if (m_file) {
         sf_close(m_file);
         m_file = sf_open(m_path.toLocal8Bit(), SFM_READ, &m_fileInfo);
         if (!m_file || m_fileInfo.channels <= 0) {
-            std::cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path.toStdString() << "\" ("
+            std::cerr << "WavFileReader::updateFrameCount: Failed to open file at \"" << m_path << "\" ("
                       << sf_strerror(m_file) << ")" << std::endl;
         }
     }
 
-//    std::cerr << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << std::endl;
+//    DEBUG << "WavFileReader::updateFrameCount: now " << m_fileInfo.frames << endl;
 
     m_frameCount = m_fileInfo.frames;
 
     if (m_channelCount == 0) {
         m_channelCount = m_fileInfo.channels;

     if (!m_file || !m_channelCount) {
         return;
     }
 
     if ((long)start >= m_fileInfo.frames) {
-//        std::cerr << "WavFileReader::getInterleavedFrames: " << start
-//                  << " > " << m_fileInfo.frames << std::endl;
+//        DEBUG << "WavFileReader::getInterleavedFrames: " << start
+//                  << " > " << m_fileInfo.frames << endl;
 	return;
     }
 
     if (long(start + count) > m_fileInfo.frames) {
 	count = m_fileInfo.frames - start;