comparison data/model/WaveFileModel.cpp @ 931:df82da55e86a warnfix_no_size_t

Disambiguate signals
author Chris Cannam
date Tue, 17 Jun 2014 15:24:55 +0100
parents 59e7fe1b1003
children d03b3d956358
comparison
equal deleted inserted replaced
930:06579b8ffb7b 931:df82da55e86a
615 int fillExtent = m_fillThread->getFillExtent(); 615 int fillExtent = m_fillThread->getFillExtent();
616 #ifdef DEBUG_WAVE_FILE_MODEL 616 #ifdef DEBUG_WAVE_FILE_MODEL
617 SVDEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl; 617 SVDEBUG << "WaveFileModel::fillTimerTimedOut: extent = " << fillExtent << endl;
618 #endif 618 #endif
619 if (fillExtent > m_lastFillExtent) { 619 if (fillExtent > m_lastFillExtent) {
620 emit modelChanged(m_lastFillExtent, fillExtent); 620 emit modelChangedWithin(m_lastFillExtent, fillExtent);
621 m_lastFillExtent = fillExtent; 621 m_lastFillExtent = fillExtent;
622 } 622 }
623 } else { 623 } else {
624 #ifdef DEBUG_WAVE_FILE_MODEL 624 #ifdef DEBUG_WAVE_FILE_MODEL
625 SVDEBUG << "WaveFileModel::fillTimerTimedOut: no thread" << endl; 625 SVDEBUG << "WaveFileModel::fillTimerTimedOut: no thread" << endl;
636 m_fillThread = 0; 636 m_fillThread = 0;
637 delete m_updateTimer; 637 delete m_updateTimer;
638 m_updateTimer = 0; 638 m_updateTimer = 0;
639 m_mutex.unlock(); 639 m_mutex.unlock();
640 if (getEndFrame() > m_lastFillExtent) { 640 if (getEndFrame() > m_lastFillExtent) {
641 emit modelChanged(m_lastFillExtent, getEndFrame()); 641 emit modelChangedWithin(m_lastFillExtent, getEndFrame());
642 } 642 }
643 emit modelChanged(); 643 emit modelChanged();
644 emit ready(); 644 emit ready();
645 #ifdef DEBUG_WAVE_FILE_MODEL 645 #ifdef DEBUG_WAVE_FILE_MODEL
646 SVDEBUG << "WaveFileModel::cacheFilled" << endl; 646 SVDEBUG << "WaveFileModel::cacheFilled" << endl;