debug cleanup

pull/18/head
Dimitri Diakopoulos 10 years ago
parent 20d12d7f97
commit 494c0ab9ec

@ -86,16 +86,15 @@ int main(int argc, const char **argv) try
//loader.Load(fileData.get(), "test_data/ad_hoc/44_16_mono.mpc"); //loader.Load(fileData.get(), "test_data/ad_hoc/44_16_mono.mpc");
} }
// Test Recording Capabilities of AudioDevice
fileData->samples.reserve(44100 * 2); fileData->samples.reserve(44100 * 2);
fileData->channelCount = 1; fileData->channelCount = 1;
fileData->frameSize = 32; fileData->frameSize = 32;
fileData->lengthSeconds = 2.0; fileData->lengthSeconds = 2.0;
fileData->sampleRate = 44100; fileData->sampleRate = 44100;
// Test Recording Capabilities of Audio Device
std::cout << "Starting recording for two seconds..." << std::endl; std::cout << "Starting recording for two seconds..." << std::endl;
std::vector<float> recordingBuffer; myDevice.Record(fileData->sampleRate * fileData->lengthSeconds, fileData->samples);
myDevice.Record(44100 * 2, fileData->samples);
// Libnyquist does not (currently) perform sample rate conversion // Libnyquist does not (currently) perform sample rate conversion
if (fileData->sampleRate != desiredSampleRate) if (fileData->sampleRate != desiredSampleRate)

@ -83,8 +83,6 @@ bool AudioDevice::Open(const int deviceId)
inputParams.nChannels = 1; inputParams.nChannels = 1;
inputParams.firstChannel = 0; inputParams.firstChannel = 0;
std::cout << "Input Device Id: " << inputParams.deviceId << std::endl;
rtaudio->openStream(&outputParams, &inputParams, RTAUDIO_FLOAT32, info.sampleRate, &info.frameSize, &rt_callback, (void*) & buffer); rtaudio->openStream(&outputParams, &inputParams, RTAUDIO_FLOAT32, info.sampleRate, &info.frameSize, &rt_callback, (void*) & buffer);
if (rtaudio->isStreamOpen()) if (rtaudio->isStreamOpen())
@ -132,7 +130,7 @@ bool AudioDevice::Play(const std::vector<float> & data)
bool AudioDevice::Record(const uint32_t lengthInSamples, std::vector<float> & recordingBuffer) bool AudioDevice::Record(const uint32_t lengthInSamples, std::vector<float> & recordingBuffer)
{ {
uint32_t recordedSamples = 0; uint64_t recordedSamples = 0;
// Allocate memory upfront (revisit this later...) // Allocate memory upfront (revisit this later...)
recordingBuffer.resize(lengthInSamples + (BUFFER_LENGTH)); // + a little padding recordingBuffer.resize(lengthInSamples + (BUFFER_LENGTH)); // + a little padding
@ -141,12 +139,10 @@ bool AudioDevice::Record(const uint32_t lengthInSamples, std::vector<float> & re
{ {
if (record_buffer.getAvailableRead()) if (record_buffer.getAvailableRead())
{ {
if(record_buffer.read(recordingBuffer.data() + recordedSamples, BUFFER_LENGTH / 2)) if (record_buffer.read(recordingBuffer.data() + recordedSamples, BUFFER_LENGTH / 2))
{ {
recordedSamples += (BUFFER_LENGTH / 2); recordedSamples += (BUFFER_LENGTH / 2);
} }
std::cout << recordedSamples << std::endl;
} }
} }

Loading…
Cancel
Save