comparison data/model/WaveFileModel.h @ 300:5877d68815c7

* Change WaveFileModel API from getValues(start,end) to getData(start,count).
  It's much less error-prone to pass in frame counts instead of start/end
  locations.  Should have done this ages ago.  This closes #1794563.
* Add option to apply a transform to only the selection region, instead of
  the whole audio.
* (to make the above work properly) Add start frame offset to wave models

     virtual Model *clone() const;
 
     float getValueMinimum() const { return -1.0f; }
     float getValueMaximum() const { return  1.0f; }
 
-    virtual size_t getStartFrame() const { return 0; }
-    virtual size_t getEndFrame() const { return getFrameCount(); }
+    virtual size_t getStartFrame() const { return m_startFrame; }
+    virtual size_t getEndFrame() const { return m_startFrame + getFrameCount(); }
 
-    virtual size_t getValues(int channel, size_t start, size_t end,
-			     float *buffer) const;
+    void setStartFrame(size_t startFrame) { m_startFrame = startFrame; }
 
-    virtual size_t getValues(int channel, size_t start, size_t end,
-			     double *buffer) const;
+    virtual size_t getData(int channel, size_t start, size_t count,
+                           float *buffer) const;
 
-    virtual void getRanges(size_t channel, size_t start, size_t end,
-                           RangeBlock &ranges,
-                           size_t &blockSize) const;
+    virtual size_t getData(int channel, size_t start, size_t count,
+                           double *buffer) const;
 
-    virtual Range getRange(size_t channel, size_t start, size_t end) 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;
 
     virtual void toXml(QTextStream &out,
                        QString indent = "",
                        QString extraAttributes = "") const;
 

     
     QString m_path;
     AudioFileReader *m_reader;
     bool m_myReader;
 
+    size_t m_startFrame;
+
     RangeBlock m_cache[2]; // interleaved at two base resolutions
     mutable QMutex m_mutex;
     RangeCacheFillThread *m_fillThread;
     QTimer *m_updateTimer;
     size_t m_lastFillExtent;