comparison data/model/WaveFileModel.cpp @ 179:0ed2b2e26b44

* Tidy up inheritance hierarchy of model classes -- remove ZoomConstraint as
  a base class (make it a member instead) and remove virtual inheritances of
  QObject (no longer necessary).

 
 #include <cassert>
 
 using std::cerr;
 using std::endl;
+
+PowerOfSqrtTwoZoomConstraint
+WaveFileModel::m_zoomConstraint;
 
 WaveFileModel::WaveFileModel(QString path) :
     m_path(path),
     m_myReader(true),
     m_fillThread(0),

 	std::cerr << "WARNING: Internal error: end <= start in WaveFileModel::getRanges (end = " << end << ", start = " << start << ", blocksize = " << blockSize << ")" << std::endl;
 	return ranges;
     }
 
     int cacheType = 0;
-    int power = getMinCachePower();
-    blockSize = getNearestBlockSize(blockSize, cacheType, power,
-				    ZoomConstraint::RoundUp);
+    int power = m_zoomConstraint.getMinCachePower();
+    blockSize = m_zoomConstraint.getNearestBlockSize
+        (blockSize, cacheType, power, ZoomConstraint::RoundUp);
 
     size_t channels = getChannelCount();
 
     if (cacheType != 0 && cacheType != 1) {
 

 	const RangeBlock &cache = m_cache[cacheType];
 
 	size_t cacheBlock, div;
         
 	if (cacheType == 0) {
-	    cacheBlock = (1 << getMinCachePower());
+	    cacheBlock = (1 << m_zoomConstraint.getMinCachePower());
             div = (1 << power) / cacheBlock;
 	} else {
-	    cacheBlock = ((unsigned int)((1 << getMinCachePower()) * sqrt(2) + 0.01));
+	    cacheBlock = ((unsigned int)((1 << m_zoomConstraint.getMinCachePower()) * sqrt(2) + 0.01));
             div = ((unsigned int)((1 << power) * sqrt(2) + 0.01)) / cacheBlock;
 	}
 
 	size_t startIndex = start / cacheBlock;
 	size_t endIndex = end / cacheBlock;

 
 void
 WaveFileModel::RangeCacheFillThread::run()
 {
     size_t cacheBlockSize[2];
-    cacheBlockSize[0] = (1 << m_model.getMinCachePower());
-    cacheBlockSize[1] = ((unsigned int)((1 << m_model.getMinCachePower()) *
+    cacheBlockSize[0] = (1 << m_model.m_zoomConstraint.getMinCachePower());
+    cacheBlockSize[1] = ((unsigned int)((1 << m_model.m_zoomConstraint.getMinCachePower()) *
                                         sqrt(2) + 0.01));
     
     size_t frame = 0;
     size_t readBlockSize = 16384;
     SampleBlock block;