Mercurial > hg > svapp
comparison audio/AudioGenerator.cpp @ 686:610fa108fbcc by-id
Update for changes to PlayParameters
author | Chris Cannam |
---|---|
date | Thu, 04 Jul 2019 18:04:59 +0100 |
parents | 161063152ddd |
children | 3c5dc95bea91 |
comparison
equal
deleted
inserted
replaced
685:7540733f5480 | 686:610fa108fbcc |
---|---|
129 m_sourceSampleRate = model->getSampleRate(); | 129 m_sourceSampleRate = model->getSampleRate(); |
130 return true; | 130 return true; |
131 } | 131 } |
132 } | 132 } |
133 | 133 |
134 PlayParameters *parameters = | 134 auto parameters = |
135 PlayParameterRepository::getInstance()->getPlayParameters | 135 PlayParameterRepository::getInstance()->getPlayParameters |
136 (modelId.untyped); | 136 (modelId.untyped); |
137 | 137 |
138 if (!parameters) { | 138 if (!parameters) { |
139 SVCERR << "WARNING: Model with canPlay true is not known to PlayParameterRepository" << endl; | 139 SVCERR << "WARNING: Model with canPlay true is not known to PlayParameterRepository" << endl; |
220 ClipMixer * | 220 ClipMixer * |
221 AudioGenerator::makeClipMixerFor(ModelId modelId) | 221 AudioGenerator::makeClipMixerFor(ModelId modelId) |
222 { | 222 { |
223 QString clipId; | 223 QString clipId; |
224 | 224 |
225 PlayParameters *parameters = | 225 auto parameters = |
226 PlayParameterRepository::getInstance()->getPlayParameters | 226 PlayParameterRepository::getInstance()->getPlayParameters |
227 (modelId.untyped); | 227 (modelId.untyped); |
228 if (parameters) { | 228 if (parameters) { |
229 clipId = parameters->getPlayClipId(); | 229 clipId = parameters->getPlayClipId(); |
230 } | 230 } |
372 QMutexLocker locker(&m_mutex); | 372 QMutexLocker locker(&m_mutex); |
373 | 373 |
374 auto model = ModelById::get(modelId); | 374 auto model = ModelById::get(modelId); |
375 if (!model || !model->canPlay()) return frameCount; | 375 if (!model || !model->canPlay()) return frameCount; |
376 | 376 |
377 PlayParameters *parameters = | 377 auto parameters = |
378 PlayParameterRepository::getInstance()->getPlayParameters | 378 PlayParameterRepository::getInstance()->getPlayParameters |
379 (modelId.untyped); | 379 (modelId.untyped); |
380 if (!parameters) return frameCount; | 380 if (!parameters) return frameCount; |
381 | 381 |
382 bool playing = !parameters->isPlayMuted(); | 382 bool playing = !parameters->isPlayMuted(); |