# HG changeset patch
# User Chris Cannam
# Date 1215694256 0
# Node ID 3b61a975b47e5e3ae978720daea8d7258cbf4ced
# Parent  883f7fc7fd3493f156312e8586a70cc5f5bcd50f
* Updates for 1.3

diff -r 883f7fc7fd34 -r 3b61a975b47e audioio/AudioCallbackPlaySource.cpp
--- a/audioio/AudioCallbackPlaySource.cpp	Mon Jul 07 17:16:18 2008 +0000
+++ b/audioio/AudioCallbackPlaySource.cpp	Thu Jul 10 12:50:56 2008 +0000
@@ -376,7 +376,9 @@
 	}
     }
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
     std::cerr << "play(" << startFrame << ") -> playback model ";
+#endif
 
     startFrame = m_viewManager->alignReferenceToPlaybackFrame(startFrame);
 
@@ -400,7 +402,9 @@
     if (m_readBuffers) {
         for (size_t c = 0; c < getTargetChannelCount(); ++c) {
             RingBuffer<float> *rb = getReadRingBuffer(c);
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
             std::cerr << "reset ring buffer for channel " << c << std::endl;
+#endif
             if (rb) rb->reset();
         }
     }
@@ -693,8 +697,8 @@
         RealTime playstart_t = RealTime::frame2RealTime(m_playStartFrame,
                                                         sourceRate);
         if (playing_t < playstart_t) {
-            std::cerr << "playing_t " << playing_t << " < playstart_t " 
-                      << playstart_t << std::endl;
+//            std::cerr << "playing_t " << playing_t << " < playstart_t " 
+//                      << playstart_t << std::endl;
             if (/*!!! sincerequest_t > RealTime::zeroTime && */
                 m_playStartedAt + latency_t + stretchlat_t <
                 RealTime::fromSeconds(currentTime)) {
diff -r 883f7fc7fd34 -r 3b61a975b47e framework/Document.cpp
--- a/framework/Document.cpp	Mon Jul 07 17:16:18 2008 +0000
+++ b/framework/Document.cpp	Thu Jul 10 12:50:56 2008 +0000
@@ -581,8 +581,10 @@
 
     m_layers.erase(layer);
 
+#ifdef DEBUG_DOCUMENT
     std::cerr << "Document::deleteLayer: Removing, now have "
               << m_layers.size() << " layers" << std::endl;
+#endif
 
     releaseModel(layer->getModel());
     emit layerRemoved(layer);
@@ -607,7 +609,7 @@
     Model *previousModel = layer->getModel();
 
     if (previousModel == model) {
-        std::cerr << "WARNING: Document::setModel: Layer " << layer << " (\""
+        std::cerr << "NOTE: Document::setModel: Layer " << layer << " (\""
                   << layer->objectName().toStdString()
                   << "\") is already set to model "
                   << model << " (\""
diff -r 883f7fc7fd34 -r 3b61a975b47e framework/MainWindowBase.cpp
--- a/framework/MainWindowBase.cpp	Mon Jul 07 17:16:18 2008 +0000
+++ b/framework/MainWindowBase.cpp	Thu Jul 10 12:50:56 2008 +0000
@@ -873,7 +873,7 @@
 MainWindowBase::FileOpenStatus
 MainWindowBase::openAudio(FileSource source, AudioFileOpenMode mode)
 {
-    std::cerr << "MainWindowBase::openAudio(" << source.getLocation().toStdString() << ")" << std::endl;
+//    std::cerr << "MainWindowBase::openAudio(" << source.getLocation().toStdString() << ")" << std::endl;
 
     if (!source.isAvailable()) return FileOpenFailed;
     source.waitForData();
@@ -894,7 +894,7 @@
 	return FileOpenFailed;
     }
 
-    std::cerr << "mode = " << mode << std::endl;
+//    std::cerr << "mode = " << mode << std::endl;
 
     if (mode == AskUser) {
         if (getMainModel()) {
@@ -2180,7 +2180,7 @@
 void
 MainWindowBase::layerAboutToBeDeleted(Layer *layer)
 {
-    std::cerr << "MainWindowBase::layerAboutToBeDeleted(" << layer << ")" << std::endl;
+//    std::cerr << "MainWindowBase::layerAboutToBeDeleted(" << layer << ")" << std::endl;
 
     removeLayerEditDialog(layer);
 
@@ -2193,7 +2193,7 @@
 void
 MainWindowBase::layerInAView(Layer *layer, bool inAView)
 {
-    std::cerr << "MainWindowBase::layerInAView(" << layer << "," << inAView << ")" << std::endl;
+//    std::cerr << "MainWindowBase::layerInAView(" << layer << "," << inAView << ")" << std::endl;
 
     if (!inAView) removeLayerEditDialog(layer);