comparison data/model/WaveFileModel.h @ 377:166c22eff678

* Ensure waveforms are strictly correct even when using a non-power-of-two
  non-power-of-sqrt-two block size with cacheing off and painting only small
  areas at a time

 
     virtual size_t getData(size_t fromchannel, size_t tochannel,
                            size_t start, size_t count,
                            float **buffers) const;
 
+    virtual size_t getSummaryBlockSize(size_t desired) const;
+
     virtual void getSummaries(size_t channel, size_t start, size_t count,
                               RangeBlock &ranges,
                               size_t &blockSize) const;
 
     virtual Range getSummary(size_t channel, size_t start, size_t count) const;

     RangeCacheFillThread *m_fillThread;
     QTimer *m_updateTimer;
     size_t m_lastFillExtent;
     bool m_exiting;
     static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;
+
+    mutable SampleBlock m_directRead;
+    mutable size_t m_lastDirectReadStart;
+    mutable size_t m_lastDirectReadCount;
+    mutable QMutex m_directReadMutex;
 };    
 
 #endif