aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/backends/portaudio.c
diff options
context:
space:
mode:
Diffstat (limited to 'Alc/backends/portaudio.c')
-rw-r--r--Alc/backends/portaudio.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index c3898ef8..2345a282 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -377,19 +377,20 @@ static void pa_stop_capture(ALCdevice *device)
ERR("Error stopping stream: %s\n", Pa_GetErrorText(err));
}
-static void pa_capture_samples(ALCdevice *device, ALCvoid *buffer, ALCuint samples)
+static ALCuint pa_available_samples(ALCdevice *device)
{
pa_data *data = device->ExtraData;
- if(samples <= (ALCuint)RingBufferSize(data->ring))
- ReadRingBuffer(data->ring, buffer, samples);
- else
- alcSetError(device, ALC_INVALID_VALUE);
+ return RingBufferSize(data->ring);
}
-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);
+
+ if(pa_available_samples(device) < samples)
+ return ALC_INVALID_VALUE;
+ ReadRingBuffer(data->ring, buffer, samples);
+ return ALC_NO_ERROR;
}