Mercurial > hg > svcore
diff data/model/WaveFileModel.cpp @ 843:e802e550a1f2
Drop std:: from cout, cerr, endl -- pull these in through Debug.h
author | Chris Cannam |
---|---|
date | Tue, 26 Nov 2013 13:35:08 +0000 |
parents | 33fca917c800 |
children | 2896b8872834 59e7fe1b1003 |
line wrap: on
line diff
--- a/data/model/WaveFileModel.cpp Tue Nov 26 11:16:37 2013 +0000 +++ b/data/model/WaveFileModel.cpp Tue Nov 26 13:35:08 2013 +0000 @@ -32,9 +32,6 @@ //#define DEBUG_WAVE_FILE_MODEL 1 -using std::cerr; -using std::endl; - PowerOfSqrtTwoZoomConstraint WaveFileModel::m_zoomConstraint; @@ -191,7 +188,7 @@ // 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) { @@ -253,7 +250,7 @@ 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) { @@ -311,22 +308,22 @@ 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; } @@ -702,7 +699,7 @@ 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) { @@ -755,12 +752,12 @@ 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); } }