Mercurial > hg > svcore
diff data/model/ReadOnlyWaveFileModel.cpp @ 1551:4de4284d0596
Merge from branch zoom
author | Chris Cannam |
---|---|
date | Wed, 10 Oct 2018 08:44:15 +0100 |
parents | 710e6250a401 |
children | 1ae6a19464a7 d93e34684da7 |
line wrap: on
line diff
--- a/data/model/ReadOnlyWaveFileModel.cpp Wed Oct 03 15:45:57 2018 +0100 +++ b/data/model/ReadOnlyWaveFileModel.cpp Wed Oct 10 08:44:15 2018 +0100 @@ -341,6 +341,7 @@ int power = m_zoomConstraint.getMinCachePower(); int roundedBlockSize = m_zoomConstraint.getNearestBlockSize (desired, cacheType, power, ZoomConstraint::RoundDown); + if (cacheType != 0 && cacheType != 1) { // We will be reading directly from file, so can satisfy any // blocksize requirement