Mercurial > hg > svcore
comparison data/model/ReadOnlyWaveFileModel.cpp @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Tue, 17 Apr 2018 10:35:42 +0100 |
| parents | 87ae75da6527 |
| children | 0925b37a3ed1 |
comparison
equal
deleted
inserted
replaced
| 1449:deabf9fd3d28 | 1450:a12fd0456f0c |
|---|---|
| 217 #endif | 217 #endif |
| 218 | 218 |
| 219 int channels = getChannelCount(); | 219 int channels = getChannelCount(); |
| 220 | 220 |
| 221 if (channel >= channels) { | 221 if (channel >= channels) { |
| 222 cerr << "ERROR: WaveFileModel::getData: channel (" | 222 SVCERR << "ERROR: WaveFileModel::getData: channel (" |
| 223 << channel << ") >= channel count (" << channels << ")" | 223 << channel << ") >= channel count (" << channels << ")" |
| 224 << endl; | 224 << endl; |
| 225 return {}; | 225 return {}; |
| 226 } | 226 } |
| 227 | 227 |
| 276 #endif | 276 #endif |
| 277 | 277 |
| 278 int channels = getChannelCount(); | 278 int channels = getChannelCount(); |
| 279 | 279 |
| 280 if (fromchannel > tochannel) { | 280 if (fromchannel > tochannel) { |
| 281 cerr << "ERROR: ReadOnlyWaveFileModel::getData: fromchannel (" | 281 SVCERR << "ERROR: ReadOnlyWaveFileModel::getData: fromchannel (" |
| 282 << fromchannel << ") > tochannel (" << tochannel << ")" | 282 << fromchannel << ") > tochannel (" << tochannel << ")" |
| 283 << endl; | 283 << endl; |
| 284 return {}; | 284 return {}; |
| 285 } | 285 } |
| 286 | 286 |
| 287 if (tochannel >= channels) { | 287 if (tochannel >= channels) { |
| 288 cerr << "ERROR: ReadOnlyWaveFileModel::getData: tochannel (" | 288 SVCERR << "ERROR: ReadOnlyWaveFileModel::getData: tochannel (" |
| 289 << tochannel << ") >= channel count (" << channels << ")" | 289 << tochannel << ") >= channel count (" << channels << ")" |
| 290 << endl; | 290 << endl; |
| 291 return {}; | 291 return {}; |
| 292 } | 292 } |
| 293 | 293 |