Mercurial > hg > svapp

changeset 34:f6b15e0b6fde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* fix long-standing failure to silence layers that have been deleted * fix deadlock in WaveFileModel::cacheFilled * fixes and speedups to new CodedAudioFileReader * trap signals in main, clean up temporary directory
author Chris Cannam
date Fri, 28 Apr 2006 12:19:09 +0000
parents 3e0794460c4e
children 37e3c693af0c
files audioio/AudioCallbackPlaySource.cpp audioio/AudioGenerator.cpp
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/AudioCallbackPlaySource.cpp	Thu Apr 27 11:49:34 2006 +0000
+++ b/audioio/AudioCallbackPlaySource.cpp	Fri Apr 28 12:19:09 2006 +0000
@@ -96,6 +96,8 @@
 void
 AudioCallbackPlaySource::addModel(Model *model)
 {
+    if (m_models.find(model) != m_models.end()) return;
+
     bool canPlay = m_audioGenerator->addModel(model);
 
     m_mutex.lock();
--- a/audioio/AudioGenerator.cpp	Thu Apr 27 11:49:34 2006 +0000
+++ b/audioio/AudioGenerator.cpp	Fri Apr 28 12:19:09 2006 +0000
@@ -159,7 +159,7 @@
     const SparseOneDimensionalModel *sodm =
         dynamic_cast<const SparseOneDimensionalModel *>(model);
     if (sodm) {
-        program = "cowbell";
+        program = "tap";
     }
 
     const NoteModel *nm = dynamic_cast<const NoteModel *>(model);