comparison data/model/WaveFileModel.cpp @ 689:573d45e9487b

Merge from debug-output branch

     m_source.waitForData();
     if (m_source.isOK()) {
         m_reader = AudioFileReaderFactory::createThreadingReader
             (m_source, targetRate);
         if (m_reader) {
-            std::cerr << "WaveFileModel::WaveFileModel: reader rate: "
-                      << m_reader->getSampleRate() << std::endl;
+            DEBUG << "WaveFileModel::WaveFileModel: reader rate: "
+                      << m_reader->getSampleRate() << endl;
         }
     }
     if (m_reader) setObjectName(m_reader->getTitle());
     if (objectName() == "") setObjectName(QFileInfo(m_path).fileName());
     if (isOK()) fillCache();

             *completion = prevCompletion;
         }
         prevCompletion = *completion;
     }
 #ifdef DEBUG_WAVE_FILE_MODEL
-    std::cerr << "WaveFileModel::isReady(): ready = " << ready << ", completion = " << (completion ? *completion : -1) << std::endl;
+    DEBUG << "WaveFileModel::isReady(): ready = " << ready << ", completion = " << (completion ? *completion : -1) << endl;
 #endif
     return ready;
 }
 
 Model *

         for (size_t i = 0; i < count; ++i) buffer[i] = 0.f;
         return 0;
     }
 
 #ifdef DEBUG_WAVE_FILE_MODEL
-//    std::cerr << "WaveFileModel::getValues(" << channel << ", "
-//              << start << ", " << end << "): calling reader" << std::endl;
+//    DEBUG << "WaveFileModel::getValues(" << channel << ", "
+//              << start << ", " << end << "): calling reader" << endl;
 #endif
 
     int channels = getChannelCount();
 
     SampleBlock frames(count * channels);

             ranges.push_back(Range(min, max, total / got));
 	}
     }
 
 #ifdef DEBUG_WAVE_FILE_MODEL
-    cerr << "returning " << ranges.size() << " ranges" << endl;
+    DEBUG << "returning " << ranges.size() << " ranges" << endl;
 #endif
     return;
 }
 
 WaveFileModel::Range

 
     m_mutex.unlock();
     m_fillThread->start();
 
 #ifdef DEBUG_WAVE_FILE_MODEL
-    std::cerr << "WaveFileModel::fillCache: started fill thread" << std::endl;
+    DEBUG << "WaveFileModel::fillCache: started fill thread" << endl;
 #endif
 }   
 
 void
 WaveFileModel::fillTimerTimedOut()
 {
     if (m_fillThread) {
 	size_t fillExtent = m_fillThread->getFillExtent();
 #ifdef DEBUG_WAVE_FILE_MODEL
-        cerr << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl;
+        DEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl;
 #endif
 	if (fillExtent > m_lastFillExtent) {
 	    emit modelChanged(m_lastFillExtent, fillExtent);
 	    m_lastFillExtent = fillExtent;
 	}
     } else {
 #ifdef DEBUG_WAVE_FILE_MODEL
-        cerr << "WaveFileModel::fillTimerTimedOut: no thread" << std::endl;
+        DEBUG << "WaveFileModel::fillTimerTimedOut: no thread" << endl;
 #endif
 	emit modelChanged();
     }
 }
 

         emit modelChanged(m_lastFillExtent, getEndFrame());
     }
     emit modelChanged();
     emit ready();
 #ifdef DEBUG_WAVE_FILE_MODEL
-    cerr << "WaveFileModel::cacheFilled" << endl;
+    DEBUG << "WaveFileModel::cacheFilled" << endl;
 #endif
 }
 
 void
 WaveFileModel::RangeCacheFillThread::run()

     size_t channels = m_model.getChannelCount();
     bool updating = m_model.m_reader->isUpdating();
 
     if (updating) {
         while (channels == 0 && !m_model.m_exiting) {
-//            std::cerr << "WaveFileModel::fill: Waiting for channels..." << std::endl;
+//            DEBUG << "WaveFileModel::fill: Waiting for channels..." << endl;
             sleep(1);
             channels = m_model.getChannelCount();
         }
     }
 

     while (first || updating) {
 
         updating = m_model.m_reader->isUpdating();
         m_frameCount = m_model.getFrameCount();
 
-//        std::cerr << "WaveFileModel::fill: frame = " << frame << ", count = " << m_frameCount << std::endl;
+//        DEBUG << "WaveFileModel::fill: frame = " << frame << ", count = " << m_frameCount << endl;
 
         while (frame < m_frameCount) {
 
-//            std::cerr << "WaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << std::endl;
+//            DEBUG << "WaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl;
 
             if (updating && (frame + readBlockSize > m_frameCount)) break;
 
             m_model.m_reader->getInterleavedFrames(frame, readBlockSize, block);