Mercurial > hg > svapp
comparison audioio/AudioCallbackPlaySource.cpp @ 164:07d8dac78edc
* Activity log updates
* Update range lists in play source when a new model is added
* Fill cache with empty background in colour 3d plot
author | Chris Cannam |
---|---|
date | Fri, 27 Feb 2009 13:33:16 +0000 |
parents | 2c158dd3b983 |
children | f6a8fc35df93 |
comparison
equal
deleted
inserted
replaced
163:2c158dd3b983 | 164:07d8dac78edc |
---|---|
221 m_converter = 0; | 221 m_converter = 0; |
222 m_crapConverter = 0; | 222 m_crapConverter = 0; |
223 } | 223 } |
224 } | 224 } |
225 | 225 |
226 rebuildRangeLists(); | |
227 | |
226 m_mutex.unlock(); | 228 m_mutex.unlock(); |
227 | 229 |
228 m_audioGenerator->setTargetChannelCount(getTargetChannelCount()); | 230 m_audioGenerator->setTargetChannelCount(getTargetChannelCount()); |
229 | 231 |
230 if (!m_fillThread) { | 232 if (!m_fillThread) { |
283 } | 285 } |
284 | 286 |
285 size_t lastEnd = 0; | 287 size_t lastEnd = 0; |
286 for (std::set<Model *>::const_iterator i = m_models.begin(); | 288 for (std::set<Model *>::const_iterator i = m_models.begin(); |
287 i != m_models.end(); ++i) { | 289 i != m_models.end(); ++i) { |
288 // std::cout << "AudioCallbackPlaySource::removeModel(" << model << "): checking end frame on model " << *i << std::endl; | 290 #ifdef DEBUG_AUDIO_PLAY_SOURCE |
291 std::cout << "AudioCallbackPlaySource::removeModel(" << model << "): checking end frame on model " << *i << std::endl; | |
292 #endif | |
289 if ((*i)->getEndFrame() > lastEnd) lastEnd = (*i)->getEndFrame(); | 293 if ((*i)->getEndFrame() > lastEnd) lastEnd = (*i)->getEndFrame(); |
290 // std::cout << "(done, lastEnd now " << lastEnd << ")" << std::endl; | 294 #ifdef DEBUG_AUDIO_PLAY_SOURCE |
295 std::cout << "(done, lastEnd now " << lastEnd << ")" << std::endl; | |
296 #endif | |
291 } | 297 } |
292 m_lastModelEndFrame = lastEnd; | 298 m_lastModelEndFrame = lastEnd; |
293 | 299 |
294 m_mutex.unlock(); | 300 m_mutex.unlock(); |
295 | 301 |