comparison audioio/AudioCallbackPlaySource.cpp @ 435:618d5816b04d cxx11

More type fixes
author Chris Cannam
date Tue, 10 Mar 2015 13:22:10 +0000
parents dee4aceb131c
children 72c662fe7ea3
comparison
equal deleted inserted replaced
434:dee4aceb131c 435:618d5816b04d
254 254
255 if (buffersChanged || srChanged) { 255 if (buffersChanged || srChanged) {
256 emit modelReplaced(); 256 emit modelReplaced();
257 } 257 }
258 258
259 connect(model, SIGNAL(modelChangedWithin(int, int)), 259 connect(model, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)),
260 this, SLOT(modelChangedWithin(int, int))); 260 this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t)));
261 261
262 #ifdef DEBUG_AUDIO_PLAY_SOURCE 262 #ifdef DEBUG_AUDIO_PLAY_SOURCE
263 cout << "AudioCallbackPlaySource::addModel: awakening thread" << endl; 263 cout << "AudioCallbackPlaySource::addModel: awakening thread" << endl;
264 #endif 264 #endif
265 265
266 m_condition.wakeAll(); 266 m_condition.wakeAll();
267 } 267 }
268 268
269 void 269 void
270 AudioCallbackPlaySource::modelChangedWithin(int 270 AudioCallbackPlaySource::modelChangedWithin(sv_frame_t
271 #ifdef DEBUG_AUDIO_PLAY_SOURCE 271 #ifdef DEBUG_AUDIO_PLAY_SOURCE
272 startFrame 272 startFrame
273 #endif 273 #endif
274 , int endFrame) 274 , sv_frame_t endFrame)
275 { 275 {
276 #ifdef DEBUG_AUDIO_PLAY_SOURCE 276 #ifdef DEBUG_AUDIO_PLAY_SOURCE
277 SVDEBUG << "AudioCallbackPlaySource::modelChangedWithin(" << startFrame << "," << endFrame << ")" << endl; 277 SVDEBUG << "AudioCallbackPlaySource::modelChangedWithin(" << startFrame << "," << endFrame << ")" << endl;
278 #endif 278 #endif
279 if (endFrame > m_lastModelEndFrame) { 279 if (endFrame > m_lastModelEndFrame) {
289 289
290 #ifdef DEBUG_AUDIO_PLAY_SOURCE 290 #ifdef DEBUG_AUDIO_PLAY_SOURCE
291 cout << "AudioCallbackPlaySource::removeModel(" << model << ")" << endl; 291 cout << "AudioCallbackPlaySource::removeModel(" << model << ")" << endl;
292 #endif 292 #endif
293 293
294 disconnect(model, SIGNAL(modelChangedWithin(int, int)), 294 disconnect(model, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)),
295 this, SLOT(modelChangedWithin(int, int))); 295 this, SLOT(modelChangedWithin(sv_frame_t, sv_frame_t)));
296 296
297 m_models.erase(model); 297 m_models.erase(model);
298 298
299 if (m_models.empty()) { 299 if (m_models.empty()) {
300 if (m_converter) { 300 if (m_converter) {