comparison data/model/WritableWaveFileModel.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents c324d410b096
children
comparison
equal deleted inserted replaced
349:f39d33b0b265 383:94fc0591ea43
183 size_t 183 size_t
184 WritableWaveFileModel::getData(int channel, size_t start, size_t count, 184 WritableWaveFileModel::getData(int channel, size_t start, size_t count,
185 double *buffer) const 185 double *buffer) const
186 { 186 {
187 if (!m_model || m_model->getChannelCount() == 0) return 0; 187 if (!m_model || m_model->getChannelCount() == 0) return 0;
188 // std::cerr << "WritableWaveFileModel::getValues(" << channel << ", "
189 // << start << ", " << end << "): calling model" << std::endl;
190 return m_model->getData(channel, start, count, buffer); 188 return m_model->getData(channel, start, count, buffer);
189 }
190
191 size_t
192 WritableWaveFileModel::getData(size_t fromchannel, size_t tochannel,
193 size_t start, size_t count,
194 float **buffers) const
195 {
196 if (!m_model || m_model->getChannelCount() == 0) return 0;
197 return m_model->getData(fromchannel, tochannel, start, count, buffers);
198 }
199
200 size_t
201 WritableWaveFileModel::getSummaryBlockSize(size_t desired) const
202 {
203 if (!m_model) return desired;
204 return m_model->getSummaryBlockSize(desired);
191 } 205 }
192 206
193 void 207 void
194 WritableWaveFileModel::getSummaries(size_t channel, size_t start, size_t count, 208 WritableWaveFileModel::getSummaries(size_t channel, size_t start, size_t count,
195 RangeBlock &ranges, 209 RangeBlock &ranges,