comparison audioio/AudioCallbackPlaySource.cpp @ 38:54287e5e7451 sv1-v0.9rc1 sv1-v0.9rc2

* Make vertical scale alignment modes work in note layer as well as time-value
  layer, and several significant fixes to it
* Make it possible to draw notes properly on the note layer
* Show units (and frequencies etc in note layer's case) in the time-value and
  note layer description boxes
* Minor fix to item edit dialog layout
* Some minor menu rearrangement
* Comment out a lot of debug output
* Add SV website and reference URLs to Help menu, and add code to (attempt to)
  open them in the user's preferred browser

     if (dtvm) modelChannels = dtvm->getChannelCount();
     if (modelChannels > m_sourceChannelCount) {
 	m_sourceChannelCount = modelChannels;
     }
 
-    std::cerr << "Adding model with " << modelChannels << " channels " << std::endl;
+//    std::cerr << "Adding model with " << modelChannels << " channels " << std::endl;
 
     if (m_sourceSampleRate == 0) {
 
 	m_sourceSampleRate = model->getSampleRate();
 	srChanged = true;

     }
 
     size_t lastEnd = 0;
     for (std::set<Model *>::const_iterator i = m_models.begin();
 	 i != m_models.end(); ++i) {
-	std::cerr << "AudioCallbackPlaySource::removeModel(" << model << "): checking end frame on model " << *i << std::endl;
+//	std::cerr << "AudioCallbackPlaySource::removeModel(" << model << "): checking end frame on model " << *i << std::endl;
 	if ((*i)->getEndFrame() > lastEnd) lastEnd = (*i)->getEndFrame();
-	std::cerr << "(done, lastEnd now " << lastEnd << ")" << std::endl;
+//	std::cerr << "(done, lastEnd now " << lastEnd << ")" << std::endl;
     }
     m_lastModelEndFrame = lastEnd;
 
     m_mutex.unlock();
 

 
     for (size_t i = 0; i < count; ++i) {
 	m_writeBuffers->push_back(new RingBuffer<float>(m_ringBufferSize));
     }
 
-    std::cerr << "AudioCallbackPlaySource::clearRingBuffers: Created "
-	      << count << " write buffers" << std::endl;
+//    std::cerr << "AudioCallbackPlaySource::clearRingBuffers: Created "
+//	      << count << " write buffers" << std::endl;
 
     if (!haveLock) {
 	m_mutex.unlock();
-//!!!	m_condition.wakeAll();
     }
 }
 
 void
 AudioCallbackPlaySource::play(size_t startFrame)

 }
 
 void
 AudioCallbackPlaySource::setTargetBlockSize(size_t size)
 {
-    std::cerr << "AudioCallbackPlaySource::setTargetBlockSize() -> " << size << std::endl;
+//    std::cerr << "AudioCallbackPlaySource::setTargetBlockSize() -> " << size << std::endl;
     assert(size < m_ringBufferSize);
     m_blockSize = size;
 }
 
 size_t
 AudioCallbackPlaySource::getTargetBlockSize() const
 {
-    std::cerr << "AudioCallbackPlaySource::getTargetBlockSize() -> " << m_blockSize << std::endl;
+//    std::cerr << "AudioCallbackPlaySource::getTargetBlockSize() -> " << m_blockSize << std::endl;
     return m_blockSize;
 }
 
 void
 AudioCallbackPlaySource::setTargetPlayLatency(size_t latency)

 							      size_t factor,
 							      size_t blockSize) :
     m_factor(factor),
     m_blockSize(blockSize)
 {
-    std::cerr << "TimeStretcherData::TimeStretcherData(" << channels << ", " << factor << ", " << blockSize << ")" << std::endl;
+//    std::cerr << "TimeStretcherData::TimeStretcherData(" << channels << ", " << factor << ", " << blockSize << ")" << std::endl;
 
     for (size_t ch = 0; ch < channels; ++ch) {
 	m_stretcher[ch] = StretcherBuffer
 	    //!!! We really need to measure performance and work out
 	    //what sort of quality level to use -- or at least to

     m_stretchInputBuffer = new double[blockSize];
 }
 
 AudioCallbackPlaySource::TimeStretcherData::~TimeStretcherData()
 {
-    std::cerr << "IntegerTimeStretcher::~IntegerTimeStretcher" << std::endl;
+//    std::cerr << "TimeStretcherData::~TimeStretcherData" << std::endl;
 
     while (!m_stretcher.empty()) {
 	delete m_stretcher.begin()->second.first;
 	delete[] m_stretcher.begin()->second.second;
 	m_stretcher.erase(m_stretcher.begin());

     }
 		    
     m_bufferScavenger.claim(m_readBuffers);
     m_readBuffers = m_writeBuffers;
     m_readBufferFill = m_writeBufferFill;
-    std::cerr << "unified" << std::endl;
+//    std::cerr << "unified" << std::endl;
 }
 
 void
 AudioCallbackPlaySource::AudioCallbackPlaySourceFillThread::run()
 {