comparison data/model/WaveFileModel.cpp @ 843:e802e550a1f2

Drop std:: from cout, cerr, endl -- pull these in through Debug.h

 
 #include <cassert>
 
 //#define DEBUG_WAVE_FILE_MODEL 1
 
-using std::cerr;
-using std::endl;
-
 PowerOfSqrtTwoZoomConstraint
 WaveFileModel::m_zoomConstraint;
 
 WaveFileModel::WaveFileModel(FileSource source, size_t targetRate) :
     m_source(source),

     // Always read these directly from the file. 
     // This is used for e.g. audio playback.
     // Could be much more efficient (although compiler optimisation will help)
 
 #ifdef DEBUG_WAVE_FILE_MODEL
-    std::cout << "WaveFileModel::getData[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << std::endl;
+    cout << "WaveFileModel::getData[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << endl;
 #endif
 
     if (start >= m_startFrame) {
         start -= m_startFrame;
     } else {

 size_t
 WaveFileModel::getData(int channel, size_t start, size_t count,
                        double *buffer) const
 {
 #ifdef DEBUG_WAVE_FILE_MODEL
-    std::cout << "WaveFileModel::getData(double)[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << std::endl;
+    cout << "WaveFileModel::getData(double)[" << this << "]: " << channel << ", " << start << ", " << count << ", " << buffer << endl;
 #endif
 
     if (start > m_startFrame) {
         start -= m_startFrame;
     } else {

 WaveFileModel::getData(size_t fromchannel, size_t tochannel,
                        size_t start, size_t count,
                        float **buffer) const
 {
 #ifdef DEBUG_WAVE_FILE_MODEL
-    std::cout << "WaveFileModel::getData[" << this << "]: " << fromchannel << "," << tochannel << ", " << start << ", " << count << ", " << buffer << std::endl;
+    cout << "WaveFileModel::getData[" << this << "]: " << fromchannel << "," << tochannel << ", " << start << ", " << count << ", " << buffer << endl;
 #endif
 
     size_t channels = getChannelCount();
 
     if (fromchannel > tochannel) {
-        std::cerr << "ERROR: WaveFileModel::getData: fromchannel ("
+        cerr << "ERROR: WaveFileModel::getData: fromchannel ("
                   << fromchannel << ") > tochannel (" << tochannel << ")"
-                  << std::endl;
+                  << endl;
         return 0;
     }
 
     if (tochannel >= channels) {
-        std::cerr << "ERROR: WaveFileModel::getData: tochannel ("
+        cerr << "ERROR: WaveFileModel::getData: tochannel ("
                   << tochannel << ") >= channel count (" << channels << ")"
-                  << std::endl;
+                  << endl;
         return 0;
     }
 
     if (fromchannel == tochannel) {
         return getData(fromchannel, start, count, buffer[0]);

 
             if (updating && (frame + readBlockSize > m_frameCount)) break;
 
             m_model.m_reader->getInterleavedFrames(frame, readBlockSize, block);
 
-//            std::cerr << "block is " << block.size() << std::endl;
+//            cerr << "block is " << block.size() << endl;
 
             for (int i = 0; i < readBlockSize; ++i) {
 		
                 if (channels * i + channels > block.size()) break;
 

             if (m_model.m_exiting) break;
             
             m_fillExtent = frame;
         }
 
-//        std::cerr << "WaveFileModel: inner loop ended" << std::endl;
+//        cerr << "WaveFileModel: inner loop ended" << endl;
 
         first = false;
         if (m_model.m_exiting) break;
         if (updating) {
-//            std::cerr << "sleeping..." << std::endl;
+//            cerr << "sleeping..." << endl;
             sleep(1);
         }
     }
 
     if (!m_model.m_exiting) {