Mercurial > hg > svcore
comparison data/model/ReadOnlyWaveFileModel.cpp @ 1220:a68d407f9752 msvc2015_64
Further MSVC build stuff. Committing this as-is because it's building and running now, but there's a lot to tidy up.
author | Chris Cannam |
---|---|
date | Wed, 19 Oct 2016 17:33:32 +0100 |
parents | 6b847a59d908 |
children | c97a28a3baeb |
comparison
equal
deleted
inserted
replaced
1219:794b64e62e58 | 1220:a68d407f9752 |
---|---|
612 | 612 |
613 #ifdef DEBUG_WAVE_FILE_MODEL | 613 #ifdef DEBUG_WAVE_FILE_MODEL |
614 cerr << "ReadOnlyWaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl; | 614 cerr << "ReadOnlyWaveFileModel::fill inner loop: frame = " << frame << ", count = " << m_frameCount << ", blocksize " << readBlockSize << endl; |
615 #endif | 615 #endif |
616 | 616 |
617 if (updating && (frame + readBlockSize > m_frameCount)) break; | 617 if (updating && (frame + readBlockSize > m_frameCount)) { |
618 m_model.m_mutex.lock(); // must be locked on exiting loop | |
619 break; | |
620 } | |
618 | 621 |
619 block = m_model.m_reader->getInterleavedFrames(frame, readBlockSize); | 622 block = m_model.m_reader->getInterleavedFrames(frame, readBlockSize); |
620 | 623 |
621 sv_frame_t gotBlockSize = block.size() / channels; | 624 sv_frame_t gotBlockSize = block.size() / channels; |
622 | 625 |