From cc3dd648ace1f1276e909dcb07adf782a39f1cf3 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 18 Sep 2011 20:27:34 -0700 Subject: Check the number of available samples before calling the capture method --- Alc/backends/portaudio.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'Alc/backends/portaudio.c') diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c index 8070942c..4275ad80 100644 --- a/Alc/backends/portaudio.c +++ b/Alc/backends/portaudio.c @@ -377,20 +377,17 @@ static void pa_stop_capture(ALCdevice *device) ERR("Error stopping stream: %s\n", Pa_GetErrorText(err)); } -static ALCuint pa_available_samples(ALCdevice *device) +static ALCenum pa_capture_samples(ALCdevice *device, ALCvoid *buffer, ALCuint samples) { pa_data *data = device->ExtraData; - return RingBufferSize(data->ring); + ReadRingBuffer(data->ring, buffer, samples); + return ALC_NO_ERROR; } -static ALCenum pa_capture_samples(ALCdevice *device, ALCvoid *buffer, ALCuint samples) +static ALCuint pa_available_samples(ALCdevice *device) { pa_data *data = device->ExtraData; - - if(pa_available_samples(device) < samples) - return ALC_INVALID_VALUE; - ReadRingBuffer(data->ring, buffer, samples); - return ALC_NO_ERROR; + return RingBufferSize(data->ring); } -- cgit v1.2.3