changeset 445:c48bc6ddfe17 tonioni

Remove some debug; set some gain values
author Chris Cannam
date Tue, 31 Mar 2015 13:06:29 +0100
parents ba789baf642b
children 1c17a2c5e917
files audioio/AudioCallbackPlaySource.cpp audioio/AudioGenerator.cpp
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/AudioCallbackPlaySource.cpp	Tue Mar 31 11:04:44 2015 +0100
+++ b/audioio/AudioCallbackPlaySource.cpp	Tue Mar 31 13:06:29 2015 +0100
@@ -362,7 +362,9 @@
 {
     if (!haveLock) m_mutex.lock();
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
     cerr << "clearRingBuffers" << endl;
+#endif
 
     rebuildRangeLists();
 
@@ -370,13 +372,17 @@
 	if (m_writeBuffers) count = int(m_writeBuffers->size());
     }
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
     cerr << "current playing frame = " << getCurrentPlayingFrame() << endl;
 
     cerr << "write buffer fill (before) = " << m_writeBufferFill << endl;
-
+#endif
+    
     m_writeBufferFill = getCurrentBufferedFrame();
 
+#ifdef DEBUG_AUDIO_PLAY_SOURCE
     cerr << "current buffered frame = " << m_writeBufferFill << endl;
+#endif
 
     if (m_readBuffers != m_writeBuffers) {
 	delete m_writeBuffers;
--- a/audioio/AudioGenerator.cpp	Tue Mar 31 11:04:44 2015 +0100
+++ b/audioio/AudioGenerator.cpp	Tue Mar 31 13:06:29 2015 +0100
@@ -217,7 +217,9 @@
         clipId = parameters->getPlayClipId();
     }
 
+#ifdef DEBUG_AUDIO_GENERATOR
     std::cerr << "AudioGenerator::makeClipMixerFor(" << model << "): sample id = " << clipId << std::endl;
+#endif
 
     if (clipId == "") {
         SVDEBUG << "AudioGenerator::makeClipMixerFor(" << model << "): no sample, skipping" << endl;
@@ -238,7 +240,9 @@
         return 0;
     }
 
+#ifdef DEBUG_AUDIO_GENERATOR
     std::cerr << "AudioGenerator::makeClipMixerFor(" << model << "): loaded clip " << clipId << std::endl;
+#endif
 
     return mixer;
 }
@@ -254,7 +258,9 @@
                                                  m_processingBlockSize,
                                                  m_waveType);
 
+#ifdef DEBUG_AUDIO_GENERATOR
     std::cerr << "AudioGenerator::makeSynthFor(" << model << "): created synth" << std::endl;
+#endif
 
     return synth;
 }
@@ -292,7 +298,9 @@
 {
     QMutexLocker locker(&m_mutex);
 
+#ifdef DEBUG_AUDIO_GENERATOR
     cerr << "AudioGenerator::reset()" << endl;
+#endif
 
     for (ClipMixerMap::iterator i = m_clipMixerMap.begin(); i != m_clipMixerMap.end(); ++i) {
 	if (i->second) {