Mercurial > hg > svcore
comparison data/fileio/CodedAudioFileReader.cpp @ 1112:4d7de68707c8 3.0-integration
Merge from branch simple-fft-model
author | Chris Cannam |
---|---|
date | Wed, 01 Jul 2015 18:31:28 +0100 |
parents | 457a1a619c5f |
children | 6877f4200912 |
comparison
equal
deleted
inserted
replaced
1109:a65328f0c450 | 1112:4d7de68707c8 |
---|---|
450 if (count == 0) return {}; | 450 if (count == 0) return {}; |
451 | 451 |
452 sv_frame_t ix0 = start * m_channelCount; | 452 sv_frame_t ix0 = start * m_channelCount; |
453 sv_frame_t ix1 = ix0 + (count * m_channelCount); | 453 sv_frame_t ix1 = ix0 + (count * m_channelCount); |
454 | 454 |
455 | |
455 // This lock used to be a QReadWriteLock, but it appears that | 456 // This lock used to be a QReadWriteLock, but it appears that |
456 // its lock mechanism is significantly slower than QMutex so | 457 // its lock mechanism is significantly slower than QMutex so |
457 // it's not a good idea in cases like this where we don't | 458 // it's not a good idea in cases like this where we don't |
458 // really have threads taking a long time to read concurrently | 459 // really have threads taking a long time to read concurrently |
459 m_dataLock.lock(); | 460 m_dataLock.lock(); |