From e10799b8c85e680a55e950facd351abf0d6e5d45 Mon Sep 17 00:00:00 2001 From: Nevyn Bengtsson Date: Mon, 20 Jan 2020 08:52:58 +0100 Subject: [PATCH] microphone: less throwy, more MAX()y --- src/modules/audio/microphone.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/audio/microphone.c b/src/modules/audio/microphone.c index 6a5bd64f..98d2a89e 100644 --- a/src/modules/audio/microphone.c +++ b/src/modules/audio/microphone.c @@ -46,13 +46,12 @@ SoundData* lovrMicrophoneGetData(Microphone* microphone, size_t samples) { return NULL; } - size_t maxSamples = lovrMicrophoneGetSampleCount(microphone); - if (maxSamples == 0) { + size_t availableSamples = lovrMicrophoneGetSampleCount(microphone); + if (availableSamples == 0) { return NULL; } - lovrAssert(samples <= maxSamples, "Requested more audio data than is buffered by the microphone"); - if (samples == 0) { - samples = maxSamples; + if (samples == 0 || samples > availableSamples) { + samples = availableSamples; } SoundData* soundData = lovrSoundDataCreate(samples, microphone->sampleRate, microphone->bitDepth, microphone->channelCount);