From 4f31f7aae4b7eafa21020ec8c733dcb4228a6a40 Mon Sep 17 00:00:00 2001 From: fundamental Date: Tue, 21 Feb 2017 15:18:18 -0500 Subject: [PATCH] Fix Typo When bleep.nsamples < music.nsamples --- src/curses/ux_audio.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index 97bf2b9..1c8bd11 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -377,12 +377,16 @@ static void *mixer(void * UNUSED(arg)) bleep_buffer.nsamples = 0; if(music_buffer.nsamples == -1) music_buffer.nsamples = 0; - if(samples > bleep_buffer.nsamples && bleep_buffer.nsamples > 0); + if(samples > bleep_buffer.nsamples && bleep_buffer.nsamples > 0) samples = bleep_buffer.nsamples; if(samples > music_buffer.nsamples && music_buffer.nsamples > 0) samples = music_buffer.nsamples; + //both buffers have invalid sample data or are empty + if(samples == 100000) + samples = 0; + float *outbuf = calloc(samples+1,sizeof(float)); for(int i=0; i < samples; ++i) outbuf[i] += music_buffer.samples[i]; -- 2.34.1