comparison audioio/AudioCallbackPlaySource.cpp @ 465:1b4e5a567d58 3.0-integration

Merge from branch simple-fft-model
author Chris Cannam
date Wed, 01 Jul 2015 18:31:28 +0100
parents ad998a2fe9e2
children
comparison
equal deleted inserted replaced
462:83370e830c95 465:1b4e5a567d58
1286 if (got < reqd) { 1286 if (got < reqd) {
1287 cerr << "WARNING: Read underrun in playback (" 1287 cerr << "WARNING: Read underrun in playback ("
1288 << got << " < " << reqd << ")" << endl; 1288 << got << " < " << reqd << ")" << endl;
1289 } 1289 }
1290 1290
1291 ts->process(m_stretcherInputs, got, false); 1291 ts->process(m_stretcherInputs, size_t(got), false);
1292 1292
1293 fedToStretcher += got; 1293 fedToStretcher += got;
1294 1294
1295 if (got == 0) break; 1295 if (got == 0) break;
1296 1296
1298 cerr << "WARNING: AudioCallbackPlaySource::getSamples: Added " << got << " samples to time stretcher, created no new available output samples (warned = " << warned << ")" << endl; 1298 cerr << "WARNING: AudioCallbackPlaySource::getSamples: Added " << got << " samples to time stretcher, created no new available output samples (warned = " << warned << ")" << endl;
1299 if (++warned == 5) break; 1299 if (++warned == 5) break;
1300 } 1300 }
1301 } 1301 }
1302 1302
1303 ts->retrieve(buffer, count); 1303 ts->retrieve(buffer, size_t(count));
1304 1304
1305 for (int c = stretchChannels; c < getTargetChannelCount(); ++c) { 1305 for (int c = stretchChannels; c < getTargetChannelCount(); ++c) {
1306 for (int i = 0; i < count; ++i) { 1306 for (int i = 0; i < count; ++i) {
1307 buffer[c][i] = buffer[0][i]; 1307 buffer[c][i] = buffer[0][i];
1308 } 1308 }
1485 } 1485 }
1486 1486
1487 SRC_DATA data; 1487 SRC_DATA data;
1488 data.data_in = intlv; 1488 data.data_in = intlv;
1489 data.data_out = srcout; 1489 data.data_out = srcout;
1490 data.input_frames = got; 1490 data.input_frames = long(got);
1491 data.output_frames = work; 1491 data.output_frames = long(work);
1492 data.src_ratio = ratio; 1492 data.src_ratio = ratio;
1493 data.end_of_input = 0; 1493 data.end_of_input = 0;
1494 1494
1495 int err = 0; 1495 int err = 0;
1496 1496