diff data/model/WritableWaveFileModel.cpp @ 384:6f6ab834449d spectrogram-cache-rejig

* Merge from trunk

--- a/data/model/WritableWaveFileModel.cpp	Thu Nov 15 14:03:56 2007 +0000
+++ b/data/model/WritableWaveFileModel.cpp	Wed Feb 27 11:59:42 2008 +0000
@@ -185,11 +185,25 @@
                                double *buffer) const
 {
     if (!m_model || m_model->getChannelCount() == 0) return 0;
-//    std::cerr << "WritableWaveFileModel::getValues(" << channel << ", "
-//              << start << ", " << end << "): calling model" << std::endl;
     return m_model->getData(channel, start, count, buffer);
 }
 
+size_t
+WritableWaveFileModel::getData(size_t fromchannel, size_t tochannel,
+                               size_t start, size_t count,
+                               float **buffers) const
+{
+    if (!m_model || m_model->getChannelCount() == 0) return 0;
+    return m_model->getData(fromchannel, tochannel, start, count, buffers);
+}    
+
+size_t
+WritableWaveFileModel::getSummaryBlockSize(size_t desired) const
+{
+    if (!m_model) return desired;
+    return m_model->getSummaryBlockSize(desired);
+}
+
 void
 WritableWaveFileModel::getSummaries(size_t channel, size_t start, size_t count,
                                     RangeBlock &ranges,