comparison data/model/FFTModel.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 d7f3dfe6f9a4
children 59e7fe1b1003
comparison
equal deleted inserted replaced
842:23d3a6eca5c3 843:e802e550a1f2
59 size_t xratio = windowIncrement / m_server->getWindowIncrement(); 59 size_t xratio = windowIncrement / m_server->getWindowIncrement();
60 size_t yratio = m_server->getFFTSize() / fftSize; 60 size_t yratio = m_server->getFFTSize() / fftSize;
61 61
62 while (xratio > 1) { 62 while (xratio > 1) {
63 if (xratio & 0x1) { 63 if (xratio & 0x1) {
64 std::cerr << "ERROR: FFTModel: Window increment ratio " 64 cerr << "ERROR: FFTModel: Window increment ratio "
65 << windowIncrement << " / " 65 << windowIncrement << " / "
66 << m_server->getWindowIncrement() 66 << m_server->getWindowIncrement()
67 << " must be a power of two" << std::endl; 67 << " must be a power of two" << endl;
68 assert(!(xratio & 0x1)); 68 assert(!(xratio & 0x1));
69 } 69 }
70 ++m_xshift; 70 ++m_xshift;
71 xratio >>= 1; 71 xratio >>= 1;
72 } 72 }
73 73
74 while (yratio > 1) { 74 while (yratio > 1) {
75 if (yratio & 0x1) { 75 if (yratio & 0x1) {
76 std::cerr << "ERROR: FFTModel: FFT size ratio " 76 cerr << "ERROR: FFTModel: FFT size ratio "
77 << m_server->getFFTSize() << " / " << fftSize 77 << m_server->getFFTSize() << " / " << fftSize
78 << " must be a power of two" << std::endl; 78 << " must be a power of two" << endl;
79 assert(!(yratio & 0x1)); 79 assert(!(yratio & 0x1));
80 } 80 }
81 ++m_yshift; 81 ++m_yshift;
82 yratio >>= 1; 82 yratio >>= 1;
83 } 83 }
90 90
91 void 91 void
92 FFTModel::sourceModelAboutToBeDeleted() 92 FFTModel::sourceModelAboutToBeDeleted()
93 { 93 {
94 if (m_sourceModel) { 94 if (m_sourceModel) {
95 std::cerr << "FFTModel[" << this << "]::sourceModelAboutToBeDeleted(" << m_sourceModel << ")" << std::endl; 95 cerr << "FFTModel[" << this << "]::sourceModelAboutToBeDeleted(" << m_sourceModel << ")" << endl;
96 if (m_server) { 96 if (m_server) {
97 FFTDataServer::releaseInstance(m_server); 97 FFTDataServer::releaseInstance(m_server);
98 m_server = 0; 98 m_server = 0;
99 } 99 }
100 FFTDataServer::modelAboutToBeDeleted(m_sourceModel); 100 FFTDataServer::modelAboutToBeDeleted(m_sourceModel);