comparison data/model/AggregateWaveModel.cpp @ 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

 {
     return new AggregateWaveModel(m_components);
 }
 
 size_t
-AggregateWaveModel::getValues(int channel, size_t start, size_t end,
-                              float *buffer) const
+AggregateWaveModel::getData(int channel, size_t start, size_t count,
+                            float *buffer) const
 {
     int ch0 = channel, ch1 = channel;
     bool mixing = false;
     if (channel == -1) {
         ch0 = 0;

         mixing = true;
     }
 
     float *readbuf = buffer;
     if (mixing) {
-        readbuf = new float[end - start];
-        for (size_t i = 0; i < end - start; ++i) {
+        readbuf = new float[count];
+        for (size_t i = 0; i < count; ++i) {
             buffer[i] = 0.f;
         }
     }
 
-    size_t sz = end - start;
-    
+    size_t sz = count;
+
     for (int c = ch0; c <= ch1; ++c) {
         size_t szHere = 
-            m_components[c].model->getValues(m_components[c].channel,
-                                             start, end,
-                                             readbuf);
+            m_components[c].model->getData(m_components[c].channel,
+                                           start, count,
+                                           readbuf);
         if (szHere < sz) sz = szHere;
         if (mixing) {
-            for (size_t i = 0; i < end - start; ++i) {
+            for (size_t i = 0; i < count; ++i) {
                 buffer[i] += readbuf[i];
             }
         }
     }
 
     if (mixing) delete[] readbuf;
     return sz;
 }
          
 size_t
-AggregateWaveModel::getValues(int channel, size_t start, size_t end,
-                              double *buffer) const
+AggregateWaveModel::getData(int channel, size_t start, size_t count,
+                            double *buffer) const
 {
     int ch0 = channel, ch1 = channel;
     bool mixing = false;
     if (channel == -1) {
         ch0 = 0;

         mixing = true;
     }
 
     double *readbuf = buffer;
     if (mixing) {
-        readbuf = new double[end - start];
-        for (size_t i = 0; i < end - start; ++i) {
-            buffer[i] = 0.f;
-        }
-    }
-
-    size_t sz = end - start;
+        readbuf = new double[count];
+        for (size_t i = 0; i < count; ++i) {
+            buffer[i] = 0.0;
+        }
+    }
+
+    size_t sz = count;
     
     for (int c = ch0; c <= ch1; ++c) {
         size_t szHere = 
-            m_components[c].model->getValues(m_components[c].channel,
-                                             start, end,
-                                             readbuf);
+            m_components[c].model->getData(m_components[c].channel,
+                                           start, count,
+                                           readbuf);
         if (szHere < sz) sz = szHere;
         if (mixing) {
-            for (size_t i = 0; i < end - start; ++i) {
+            for (size_t i = 0; i < count; ++i) {
                 buffer[i] += readbuf[i];
             }
         }
     }
     
     if (mixing) delete[] readbuf;
     return sz;
 }
         
 void
-AggregateWaveModel::getRanges(size_t channel, size_t start, size_t end,
-                              RangeBlock &ranges, size_t &blockSize) const
+AggregateWaveModel::getSummaries(size_t channel, size_t start, size_t count,
+                                 RangeBlock &ranges, size_t &blockSize) const
 {
     //!!! complete
 }
 
 AggregateWaveModel::Range
-AggregateWaveModel::getRange(size_t channel, size_t start, size_t end) const
+AggregateWaveModel::getSummary(size_t channel, size_t start, size_t count) const
 {
     //!!! complete
     return Range();
 }