# HG changeset patch # User Chris Cannam # Date 1146226749 0 # Node ID f6b15e0b6fde4d19fd7cd57b59be7c26d8537022 # Parent 3e0794460c4e009b723d070aedc42343e2917c72 * 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 diff -r 3e0794460c4e -r f6b15e0b6fde audioio/AudioCallbackPlaySource.cpp --- 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(); diff -r 3e0794460c4e -r f6b15e0b6fde audioio/AudioGenerator.cpp --- 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(model); if (sodm) { - program = "cowbell"; + program = "tap"; } const NoteModel *nm = dynamic_cast(model);