Mercurial > hg > svcore
diff data/fft/FFTDataServer.cpp @ 411:52303ec15cd2
* Permit holding Shift while dragging an instant or other edited thing,
to override the initial drag resistance (for #1928943 sticky time
instants)
* better handling of updates during progressive decode load
* ready() signal from model (used by vect)
author | Chris Cannam |
---|---|
date | Mon, 19 May 2008 17:23:11 +0000 |
parents | 115f60df1e4d |
children | cff476cfce77 |
line wrap: on
line diff
--- a/data/fft/FFTDataServer.cpp Fri May 16 13:27:07 2008 +0000 +++ b/data/fft/FFTDataServer.cpp Mon May 19 17:23:11 2008 +0000 @@ -666,6 +666,8 @@ delete m_fillThread; m_fillThread = 0; deleteProcessingData(); + } else if (!m_fillThread->isRunning()) { + m_fillThread->start(); } else { m_condition.wakeAll(); } @@ -1130,6 +1132,7 @@ std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): " << "x > width (" << x << " > " << m_width << ")" << std::endl; +// abort(); //!!! return; } @@ -1315,10 +1318,17 @@ void FFTDataServer::FillThread::run() { +#ifdef DEBUG_FFT_SERVER_FILL + std::cerr << "FFTDataServer::FillThread::run()" << std::endl; +#endif + m_extent = 0; m_completion = 0; while (!m_server.m_model->isReady() && !m_server.m_exiting) { +#ifdef DEBUG_FFT_SERVER_FILL + std::cerr << "FFTDataServer::FillThread::run(): waiting for model " << m_server.m_model << " to be ready" << std::endl; +#endif sleep(1); } if (m_server.m_exiting) return;