Mercurial > hg > svapp
comparison audioio/AudioCallbackPlaySource.cpp @ 328:28c17ce7a6e9 tony_integration
Merge from tonioni branch
author | Chris Cannam |
---|---|
date | Tue, 28 Jan 2014 15:02:15 +0000 |
parents | 055ff09f7a08 |
children | 0876ea394902 |
comparison
equal
deleted
inserted
replaced
304:c837368b1faf | 328:28c17ce7a6e9 |
---|---|
165 if (modelChannels > m_sourceChannelCount) { | 165 if (modelChannels > m_sourceChannelCount) { |
166 m_sourceChannelCount = modelChannels; | 166 m_sourceChannelCount = modelChannels; |
167 } | 167 } |
168 | 168 |
169 #ifdef DEBUG_AUDIO_PLAY_SOURCE | 169 #ifdef DEBUG_AUDIO_PLAY_SOURCE |
170 cout << "Adding model with " << modelChannels << " channels at rate " << model->getSampleRate() << endl; | 170 cout << "AudioCallbackPlaySource: Adding model with " << modelChannels << " channels at rate " << model->getSampleRate() << endl; |
171 #endif | 171 #endif |
172 | 172 |
173 if (m_sourceSampleRate == 0) { | 173 if (m_sourceSampleRate == 0) { |
174 | 174 |
175 m_sourceSampleRate = model->getSampleRate(); | 175 m_sourceSampleRate = model->getSampleRate(); |