# HG changeset patch # User Chris Cannam # Date 1233062710 0 # Node ID 386b02c926bf371b83c04a9b6c2bca49336ec212 # Parent 99afa5fa8d30ffb05eef8406db842b1cf1bb11fe * Merge from one-fftdataserver-per-fftmodel branch. This bit of reworking (which is not described very accurately by the title of the branch) turns the MatrixFile object into something that either reads or writes, but not both, and separates the FFT file cache reader and writer implementations separately. This allows the FFT data server to have a single thread owning writers and one reader per "customer" thread, and for all locking to be vastly simplified and concentrated in the data server alone (because none of the classes it makes use of is used in more than one thread at a time). The result is faster and more trustworthy code. diff -r 99afa5fa8d30 -r 386b02c926bf audioio/AudioPulseAudioTarget.cpp --- a/audioio/AudioPulseAudioTarget.cpp Fri Jan 23 14:00:29 2009 +0000 +++ b/audioio/AudioPulseAudioTarget.cpp Tue Jan 27 13:25:10 2009 +0000 @@ -165,9 +165,9 @@ if (pa_stream_get_latency(m_stream, &latency, &negative)) { std::cerr << "AudioPulseAudioTarget::contextStateChanged: Failed to query latency" << std::endl; } - std::cerr << "Latency = " << latency << " usec" << std::endl; +// std::cerr << "Latency = " << latency << " usec" << std::endl; int latframes = (latency / 1000000.f) * float(m_sampleRate); - std::cerr << "that's " << latframes << " frames" << std::endl; +// std::cerr << "that's " << latframes << " frames" << std::endl; m_source->setTargetPlayLatency(latframes); //!!! buh }