Mercurial > hg > svapp

changeset 441:aa6fb3516e28 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents 2185d52b4758 (diff) 9429622647e6 (current diff)
children 88ae0e53a5da
files audioio/AudioCallbackPlaySource.cpp audioio/AudioGenerator.cpp audioio/ContinuousSynth.cpp
diffstat 2 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/AudioCallbackPlaySource.cpp	Wed Mar 11 12:20:06 2015 +0000
+++ b/audioio/AudioCallbackPlaySource.cpp	Mon Mar 23 11:26:28 2015 +0000
@@ -149,7 +149,7 @@
 {
     if (m_models.find(model) != m_models.end()) return;
 
-    bool canPlay = m_audioGenerator->addModel(model);
+    bool willPlay = m_audioGenerator->addModel(model);
 
     m_mutex.lock();
 
@@ -225,7 +225,7 @@
 	clearRingBuffers(true, getTargetChannelCount());
 	buffersChanged = true;
     } else {
-	if (canPlay) clearRingBuffers(true);
+	if (willPlay) clearRingBuffers(true);
     }
 
     if (buffersChanged || srChanged) {
--- a/audioio/AudioGenerator.cpp	Wed Mar 11 12:20:06 2015 +0000
+++ b/audioio/AudioGenerator.cpp	Mon Mar 23 11:26:28 2015 +0000
@@ -124,12 +124,20 @@
 	}
     }
 
+    const Playable *playable = model;
+    if (!playable || !playable->canPlay()) return 0;
+
+    PlayParameters *parameters =
+	PlayParameterRepository::getInstance()->getPlayParameters(playable);
+
+    bool willPlay = !parameters->isPlayMuted();
+    
     if (usesClipMixer(model)) {
         ClipMixer *mixer = makeClipMixerFor(model);
         if (mixer) {
             QMutexLocker locker(&m_mutex);
             m_clipMixerMap[model] = mixer;
-            return true;
+            return willPlay;
         }
     }
 
@@ -138,7 +146,7 @@
         if (synth) {
             QMutexLocker locker(&m_mutex);
             m_continuousSynthMap[model] = synth;
-            return true;
+            return willPlay;
         }
     }