comparison audioio/AudioCallbackPlaySource.cpp @ 220:0b1886cee2cf templating

Merge from default branch

     std::cerr << "AudioCallbackPlaySource::~AudioCallbackPlaySource entering" << std::endl;
 #endif
     m_exiting = true;
 
     if (m_fillThread) {
-	m_condition.wakeAll();
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource dtor: awakening thread" << std::endl;
+#endif
+        m_condition.wakeAll();
 	m_fillThread->wait();
 	delete m_fillThread;
     }
 
     clearModels();

     }
 
     connect(model, SIGNAL(modelChanged(size_t, size_t)),
             this, SLOT(modelChanged(size_t, size_t)));
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource::addModel: awakening thread" << std::endl;
+#endif
+
     m_condition.wakeAll();
 }
 
 void
 AudioCallbackPlaySource::modelChanged(size_t startFrame, size_t endFrame)

 	std::cout << "(done, lastEnd now " << lastEnd << ")" << std::endl;
 #endif
     }
     m_lastModelEndFrame = lastEnd;
 
+    m_audioGenerator->removeModel(model);
+
     m_mutex.unlock();
-
-    m_audioGenerator->removeModel(model);
 
     clearRingBuffers();
 }
 
 void

 
     bool changed = !m_playing;
     m_lastRetrievalTimestamp = 0;
     m_lastCurrentFrame = 0;
     m_playing = true;
+
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource::play: awakening thread" << std::endl;
+#endif
+
     m_condition.wakeAll();
     if (changed) {
         emit playStatusChanged(m_playing);
         emit activity(tr("Play from %1").arg
                       (RealTime::frame2RealTime

 }
 
 void
 AudioCallbackPlaySource::stop()
 {
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cerr << "AudioCallbackPlaySource::stop()" << std::endl;
+#endif
     bool changed = m_playing;
     m_playing = false;
+
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource::stop: awakening thread" << std::endl;
+#endif
+
     m_condition.wakeAll();
     m_lastRetrievalTimestamp = 0;
     if (changed) {
         emit playStatusChanged(m_playing);
         emit activity(tr("Stop at %1").arg

 	    }
 	}
 	return 0;
     }
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE_PLAYING
+    std::cerr << "AudioCallbackPlaySource::getSourceSamples: Playing" << std::endl;
+#endif
+
     // Ensure that all buffers have at least the amount of data we
     // need -- else reduce the size of our requests correspondingly
 
     for (size_t ch = 0; ch < getTargetChannelCount(); ++ch) {
 

 		}
 	    }
 	}
 
         applyAuditioningEffect(count, buffer);
+
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource::getSamples: awakening thread" << std::endl;
+#endif
 
         m_condition.wakeAll();
 
 	return got;
     }

         }
     }
 
     applyAuditioningEffect(count, buffer);
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
+    std::cout << "AudioCallbackPlaySource::getSamples [stretched]: awakening thread" << std::endl;
+#endif
+
     m_condition.wakeAll();
 
     return count;
 }