Fix Typo When bleep.nsamples < music.nsamples
authorfundamental <mark.d.mccurry@gmail.com>
Tue, 21 Feb 2017 20:18:18 +0000 (15:18 -0500)
committerfundamental <mark.d.mccurry@gmail.com>
Tue, 21 Feb 2017 20:18:18 +0000 (15:18 -0500)
src/curses/ux_audio.c

index 97bf2b95660e6982cc2c49fb474e04c40e7d6b62..1c8bd11a411c8764316853de1f580cd629f93c38 100644 (file)
@@ -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];